diff options
| author | Kefu Chai <kchai@redhat.com> | 2016-01-21 05:52:54 +0100 |
|---|---|---|
| committer | Kefu Chai <kchai@redhat.com> | 2016-01-21 06:12:48 +0100 |
| commit | 4d00a1418e7eba81b2dc013810a03158287d7c8e (patch) | |
| tree | bbad3dcdc84a687a578c433ee377bd556d3cae27 /SubmittingPatches.rst | |
| parent | SubmittingPatches: sending kernel patches to mailing list (diff) | |
| download | ceph-4d00a1418e7eba81b2dc013810a03158287d7c8e.tar.xz ceph-4d00a1418e7eba81b2dc013810a03158287d7c8e.zip | |
SubmittingPatches: rebase to resolve conflicts
pull request is not supposed to contain merge commits
Signed-off-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'SubmittingPatches.rst')
| -rw-r--r-- | SubmittingPatches.rst | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/SubmittingPatches.rst b/SubmittingPatches.rst index 3e2624bbcb3..87855d5f813 100644 --- a/SubmittingPatches.rst +++ b/SubmittingPatches.rst @@ -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: |