Changes between Version 24 and Version 25 of DeveloperGuidelines/Git

Timestamp:

01/26/12 01:45:00 (13 years ago)

Author:

Michael Howden

Comment:

--

DeveloperGuidelines/Git

@@ -53 +53 @@
 git pull upstream master
 git checkout -b <mystory>
+# Write Code
 git commit -am "My Story"
 # Quick review of code (no test code left in, etc)
@@ -69 +70 @@
 }}}
 
-To resolve merge conflicts, you can create the .THIS & .OTHER files using:
+=== Resolving Merge Conflicts ===
+You can create the .THIS & .OTHER files using:
 {{{
 git show :2:file.txt > file.txt.THIS
 git show :3:file.txt > file.txt.OTHER
 }}}
-
+Alternatively you can use the changes in your remote branch (theirs / OTHER):
+{{{
+git checkout --theirs . # checkout our local version of all files
+git add -u             # mark all conflicted files as merged
+git commit             # commit the merge
+}}}
+Or the changes in your local branch (ours / THIS)
+{{{
+git checkout --ours . # checkout our local version of all files
+git add -u            # mark all conflicted files as merged
+git commit            # commit the merge
+}}}
 Although on Windows this seems by default to produce UTF-16 files! ('UCS-2 Little Endian'). A script to make this process easier for Windows users is attached: [http://eden.sahanafoundation.org/attachment/wiki/DeveloperGuidelines/Git/merge.cmd merge.cmd]
 === Developer Configuration ===