Changes between Version 6 and Version 7 of GitCreateBundle

Timestamp:

Oct 18, 2013, 1:12:55 PM (11 years ago)

Author:

Piero Campalani

Comment:

add section on conflicts and diff3 style

GitCreateBundle

@@ -4 +4 @@
 
 == Why git bundles ==
+
+MERGE BRANCHES VIA PATCH MANAGER.
 
 Currently, the repo is folded into different public branches, letting a contributor choose on which of these branch his new patch is meant to be applied (see [RasdamanReleaseProcess#Branchingmodel here] for details). 
@@ -64 +66 @@
   release_8.5
 $ git merge feature_X --no-ff
-# In case of "Automatic merge failed; fix conflicts and then commit the result.", then see you later.
+# ..and we assume there is no conflict, see 
 
 # Check:
@@ -180 +182 @@
 }}}
 
+== Fixing conflicts ==
+
+During a merge, you can often stumble upon one, two or several thousands of conflicts:
+
+{{{
+#!sh
+$ git merge feature_X
+...
+Automatic merge failed; fix conflicts and then commit the result.
+}}}
+
+In this case I would first suggest to configure `git` to present the conflicts with the so-called `diff3` style ([http://stackoverflow.com/questions/161813/how-do-i-fix-merge-conflicts-in-git thanks CoolAJ86]), which is:
+
+{{{
+<<<<<<<
+Changes made on the branch that is being merged into. In most cases,
+this is the branch that I have currently checked out (i.e. HEAD).
+|||||||
+The common ancestor version.
+=======
+Changes made on the branch that is being merged in. This is often a 
+feature/topic branch.
+>>>>>>>
+}}}
+
+It ''really'' helps you better understand the conflicts.
+You can configure it with:
+
+{{{
+#!sh
+$ git merge --abort
+$ git config merge.conflictstyle diff3
+}}}
+
+Then, [http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging#Basic-Merge-Conflicts as usual], fix conflicts, and commit:
+
+{{{
+$ git merge
+...
+Auto-merging Makefile.am
+CONFLICT (content): Merge conflict in Makefile.am
+Automatic merge failed; fix conflicts and then commit the result.
+$ vim Makefile.am
+...fix...
+$ git add Makefile.am
+$ git commit
+}}}
+
+...and now you can proceed with the [wiki:GitCreateBundle#Creatingandsubmittingabundle bundle].
 
 == Further reading ==