vulpine
Rebase encountered two cases
- fast-forward: This is certainly not conflict
- non-fast-forward: possible conflict may not
Conflict: Conflict is a machine does not know how to deal with people to manual processing
Procedure rebase
b branched to a branch like rebase
-
Executed on a branch:
git rebase b -
It may require processing branch
-
No conflict
without any treatment -
Conflict
Conflicts must be handled manually, after git add. Marked done, then rebase git rebase --contine completion (after treatment with different git merge, in the Add git. After processing the conflict is not git commit)
-
