gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SubmittingPatches: rebase to resolve conflicts

Browse Source 
pull request is not supposed to contain merge commits

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2016-01-21 12:52:54 +08:00
parent a2c1b53684
commit 4d00a1418e
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
SubmittingPatches.rst
View File

@ -258,6 +258,19 @@ feature.
to ping the reviewer again or comment on the pull request to ensure the updates
are noticed.
Sometimes your change could be based on an outdated parent commit and has
conflicts with the latest target branch, then you need to fetch the updates
from the remote branch, rebase your change onto it, and resolve the conflicts
before doing the force-push
.. code-block:: bash
$ git pull --rebase origin target-branch
So that the pull request does not contain any "merge" commit. Instead of "merging"
the target branch, we expect a linear history in a pull request where you
commit on top of the remote branch.
Q: Which branch should I target in my pull request?
A: The target branch depends on the nature of your change: