git codereview

git

代码review流程 （待讨论）

1 从最新的master branch checkout出自己的task branch

$git checkout master
$git checkout -b task-1

2 在自己的task branch上提交，做review，修改等

$git add some_file
$git commit -m "new commit"
$git add some_other_file
$git commit -m "fixup"
#提交到远程
$git push origin task-1

3 rebase task branch, 整理task branch

$git rebase -i `hash of the first task branch commit`

4 rebase master, 如果有冲突，解决冲突

首先更新本地master branch到最新状态

$git checkout master
$git pull --rebase master

然后切回到task branch，rebase master

$git checkout task-1
$git rebase master

如果rebase有冲突，解决冲突，提交代码做review

5 最后merge到master, 然后push 到远程master, 如果被reject重复步骤4

$git checkout master
$git merge task-1
$git push origin master