Changes between Version 25 and Version 26 of DeveloperGuidelines/Git


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

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v25 v26  
    7676git show :3:file.txt > file.txt.OTHER
    7777}}}
    78 Alternatively you can use the changes in your remote branch (theirs / OTHER):
     78You can use the changes to a file in the remote branch (theirs / OTHER):
     79{{{
     80git checkout --theirs filename.c
     81git add filename.c
     82git commit
     83}}}
     84...or the changes to a file in your local branch (ours / THIS):
     85{{{
     86git checkout --ours filename.c
     87git add filename.c
     88git commit
     89}}}
     90...or the changes to ALL files in the remote branch (theirs / OTHER):
    7991{{{
    8092git checkout --theirs . # checkout our local version of all files
     
    8294git commit             # commit the merge
    8395}}}
    84 Or the changes in your local branch (ours / THIS)
     96Or the changes to ALL files in your local branch (ours / THIS)
    8597{{{
    8698git checkout --ours . # checkout our local version of all files