Changes between Version 14 and Version 15 of DeveloperGuidelines/Git


Ignore:
Timestamp:
01/04/12 13:50:18 (10 years ago)
Author:
Fran Boon
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v14 v15  
    5656git branch -d <mystory>
    5757}}}
     58
     59To resolve merge conflicts, you can create the .THIS & .OTHER files using:
     60{{{
     61git show :2:file.txt > file.txt.THIS
     62git show :3:file.txt > file.txt.OTHER
     63}}}
     64
     65Although 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
    5866=== Developer Configuration ===
    5967{{{