alvaro/git-flight-rules
1
0
Fork 0
mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-03-10 12:48:43 -03:00
Code Issues Releases Wiki Activity

Add Note About --ours and --theirs (#133)

Browse Source 
* add note about --ours and --theirs

* correct error message, add more detail on ours/theirs
This commit is contained in:
Kai Dalgleish 2017-11-14 11:36:22 -08:00 committed by Richard Littauer
parent fc459528ea
commit b244c00a4e
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
README.md
View File

@ -825,7 +825,7 @@ Changes not staged for commit:
(use "git add <file>..." to update what will be committed) (use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory) (use "git checkout -- <file>..." to discard changes in working directory)
modified: README.md both modified: README.md
``` ```
In this example, `README.md` has conflicts. Open that file and look for the following: In this example, `README.md` has conflicts. Open that file and look for the following:
@ -840,7 +840,16 @@ In this example, `README.md` has conflicts. Open that file and look for the foll
You will need to resolve the differences between the code that was added in your new commit (in the example, everything from the middle line to `new-commit`) and your `HEAD`. You will need to resolve the differences between the code that was added in your new commit (in the example, everything from the middle line to `new-commit`) and your `HEAD`.
Sometimes these merges are complicated and you should use a visual diff editor: If you want to keep one branch's version of the code, you can use `--ours` or `--theirs`:
```sh
(master*)$ git checkout --ours README.md
```
- When *merging*, use `--ours` to keep changes from the local branch, or `--theirs` to keep changes from the other branch.
- When *rebasing*, use `--theirs` to keep changes from the local branch, or `--ours` to keep changes from the other branch. For an explanation of this swap, see [this note in the git documentation](https://git-scm.com/docs/git-rebase#git-rebase---merge).
If the merges are more complicated, you can use a visual diff editor:
```sh ```sh
(master*)$ git mergetool -t opendiff (master*)$ git mergetool -t opendiff