Changes between Version 25 and Version 26 of DeveloperGuidelines/Git

Timestamp:

01/26/12 01:53:30 (13 years ago)

Author:

Michael Howden

Comment:

--

DeveloperGuidelines/Git

@@ -76 +76 @@
 git show :3:file.txt > file.txt.OTHER
 }}}
-Alternatively you can use the changes in your remote branch (theirs / OTHER):
+You can use the changes to a file in the remote branch (theirs / OTHER):
+{{{
+git checkout --theirs filename.c
+git add filename.c
+git commit 
+}}}
+...or the changes to a file in your local branch (ours / THIS):
+{{{
+git checkout --ours filename.c
+git add filename.c
+git commit
+}}}
+...or the changes to ALL files in the remote branch (theirs / OTHER):
 {{{
 git checkout --theirs . # checkout our local version of all files
@@ -82 +94 @@
 git commit             # commit the merge
 }}}
-Or the changes in your local branch (ours / THIS)
+Or the changes to ALL files in your local branch (ours / THIS)
 {{{
 git checkout --ours . # checkout our local version of all files