0

Add comment about fixing merge conflicts

When working with downstream branches chained to upstream branches, it
helps to use `git rebase -i @{u}` twice to pull upstream changes into
the downstream branch. Expect a lot of merge conflicts when you do
this, as git is often not smart enough to figure out which change
happened more recently, and should take precedence.

Bug: None
Change-Id: Ic742439981d6d63e8d6bd1e10776fa920c88eb7f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2341387
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Commit-Queue: Toby Huang <tobyhuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796561}
This commit is contained in:
Toby Huang
2020-08-10 21:44:40 +00:00
committed by Commit Bot
parent 197692bfa8
commit 2c40fc5a1f

@@ -48,6 +48,9 @@ your downstream branch, you need to:
* Run `git rebase -i @{u}` again to rebase the downstream changes onto the * Run `git rebase -i @{u}` again to rebase the downstream changes onto the
upstream branch. upstream branch.
Expect to fix numerous merge conflicts. Use `git rebase --continue` once you're
done.
## 3. Make your changes ## 3. Make your changes
Do your thing. There's no further advice here about how to write or fix code. Do your thing. There's no further advice here about how to write or fix code.