Skip to content

Instantly share code, notes, and snippets.

@rambolee

rambolee/git_merge_branch_checklist.md

Last active October 25, 2016 10:04
Show Gist options
  • Save rambolee/83c1bcbb24fb2a93c2ae6db0730b4543 to your computer and use it in GitHub Desktop.
Save rambolee/83c1bcbb24fb2a93c2ae6db0730b4543 to your computer and use it in GitHub Desktop.
Download ZIP
git 合并代码相关流程
Raw
git_merge_branch_checklist.md

git 合并代码相关流程

  • 提交本地代码（当前branch rambo）完毕。包括本地仓库和远程仓库
  • merge dev，解决与DEV的冲突，然后，提交到本地仓库和远程仓库
  • 切换到dev的branch
  • 拉取远程代码，更新本地环境到最新
  • 解决冲突（可能）
  • merge rambo， 解决与rambo的冲突，然后，提交到本地仓库和远程仓库
  • 切换到rambo，继续干活
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment