gawkworkflow: Merge Conflicts

1 
1 4.5.2 Dealing With Merge Conflicts
1 ----------------------------------
1 
1 Sometimes, when merging from 'master' into your branch, or from a branch
1 into 'master', there will be "merge conflicts".  These are one or more
1 areas within a file where there are conflicting sets of changes, and Git
1 could not do the merge for you.  In this case, the conflicted area will
1 be delimited by the traditional conflict markers, '<<<', '===' and
1 '>>>'.
1 
1    Your mission is then to edit the file and "resolve" the conflict by
1 fixing the order of additions (such as in a 'ChangeLog' file), or fixing
1 the code to take new changes into account.
1 
1    Once you have done so, you tell Git that everything is OK using 'git
1 add' and 'git commit':
1 
1      $ git checkout feature/python        Move back to new, purely local branch
1      $ git rebase master                  "Start over" from current master
1      -| ... Kaboom! Conflict. FIXME: Show real output here
1      $ gvim main.c                        Edit the file and fix the problem
1      $ git add main.c                     Tell Git everything is OK now ...
1      $ git commit                         ... and it's settled
1      $ git rebase --continue              Continue the rebase
1 
1    The 'git rebase --continue' then continues the process of rebasing
1 the current branch that we started in ⇒Rebasing.  It's not
1 necessary if you are using 'git merge' (⇒Points to remember).
1