Changes between Version 24 and Version 25 of DeveloperGuidelines/Git


Ignore:
Timestamp:
01/26/12 01:45:00 (10 years ago)
Author:
Michael Howden
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v24 v25  
    5353git pull upstream master
    5454git checkout -b <mystory>
     55# Write Code
    5556git commit -am "My Story"
    5657# Quick review of code (no test code left in, etc)
     
    6970}}}
    7071
    71 To resolve merge conflicts, you can create the .THIS & .OTHER files using:
     72=== Resolving Merge Conflicts ===
     73You can create the .THIS & .OTHER files using:
    7274{{{
    7375git show :2:file.txt > file.txt.THIS
    7476git show :3:file.txt > file.txt.OTHER
    7577}}}
    76 
     78Alternatively you can use the changes in your remote branch (theirs / OTHER):
     79{{{
     80git checkout --theirs . # checkout our local version of all files
     81git add -u             # mark all conflicted files as merged
     82git commit             # commit the merge
     83}}}
     84Or the changes in your local branch (ours / THIS)
     85{{{
     86git checkout --ours . # checkout our local version of all files
     87git add -u            # mark all conflicted files as merged
     88git commit            # commit the merge
     89}}}
    7790Although 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]
    7891=== Developer Configuration ===