Changes between Version 14 and Version 15 of DeveloperGuidelines/Git

Timestamp:

01/04/12 13:50:18 (13 years ago)

Author:

Fran Boon

Comment:

--

DeveloperGuidelines/Git

@@ -56 +56 @@
 git branch -d <mystory>
 }}}
+
+To resolve 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
+}}}
+
+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: merge.cmd
 === Developer Configuration ===
 {{{