| commit | 2c40fc5a1f2edd2f3bed1ca84d5ccb059dd4cffa | [log] [tgz] |
|---|---|---|
| author | Toby Huang <tobyhuang@chromium.org> | Mon Aug 10 21:44:40 2020 |
| committer | Commit Bot <commit-bot@chromium.org> | Mon Aug 10 21:44:40 2020 |
| tree | 4e5529dae1fbbc66fd81b5a5d91f6297ee87c402 | |
| parent | 197692bfa87a87fb5cf89148a600f93a196276a9 [diff] |
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}
ChromiumChromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.
The project's web site is https://www.chromium.org.
Documentation in the source is rooted in docs/README.md.
Learn how to Get Around the Chromium Source Code Directory Structure .
For historical reasons, there are some small top level directories. Now the guidance is that new top level directories are for product (e.g. Chrome, Android WebView, Ash). Even if these products have multiple executables, the code should be in subdirectories of the product.