Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

docs: Add info on resolving merge conflicts to git-guide.md. 

Fixes #5586.
This commit is contained in:
Vaida Plankyte 2017-06-29 17:30:29 +01:00 committed by Tim Abbott
parent d88e7308bf
commit 9bb0602ad4
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/git-guide.md
View File

@ -1245,6 +1245,16 @@ To fix, open all the files with conflicts in your editor and decide which edits
should be applied. Git uses standard conflict-resolution (`<<<<<<<`, `=======`, should be applied. Git uses standard conflict-resolution (`<<<<<<<`, `=======`,
and `>>>>>>>`) markers to indicate where in files there are conflicts. and `>>>>>>>`) markers to indicate where in files there are conflicts.
Tip: You can see recent changes made to a file by running the following
commands:
```
git fetch upstream
git log -p upstream/master -- /path/to/file
```
You can use this to compare the changes that you have made to a file with the
ones in upstream, helping you avoid undoing changes from a previous commit when
you are rebasing.
Once you've done that, save the file(s), stage them with `git add` and then Once you've done that, save the file(s), stage them with `git add` and then
continue the rebase with `git rebase --continue`: continue the rebase with `git rebase --continue`: