diff options
author | Smit tay <damnedyankee@gmail.com> | 2021-05-02 12:55:16 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2021-05-03 16:15:27 (GMT) |
commit | b82052feb861f111b2373b2261dcf30a37c31b65 (patch) | |
tree | 8dc15e4ceda15576c0697730cb47b99322bc8b55 /Help/dev/review.rst | |
parent | 4e5893b658b1c360c1b2d9413dbd66b2b02dbacc (diff) | |
download | CMake-b82052feb861f111b2373b2261dcf30a37c31b65.zip CMake-b82052feb861f111b2373b2261dcf30a37c31b65.tar.gz CMake-b82052feb861f111b2373b2261dcf30a37c31b65.tar.bz2 |
Help/dev/review: Clarify instructions to update existing merge requests
Diffstat (limited to 'Help/dev/review.rst')
-rw-r--r-- | Help/dev/review.rst | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Help/dev/review.rst b/Help/dev/review.rst index 10ff87b..198e100 100644 --- a/Help/dev/review.rst +++ b/Help/dev/review.rst @@ -20,8 +20,10 @@ creating a *merge request* ("MR"). The new MR will appear on the process is managed by the merge request page for the change. During the review process, the MR submitter should address review comments -or test failures by updating the MR with a (force-)push of the topic -branch. The update initiates a new round of review. +or test failures by updating their local topic branch to fix their commits +(e.g. via ``git commit --amend`` or ``git rebase -i``), and then issuing a +(force-)push of the topic branch to their remote (e.g. ``git push --force``). +This will automatically initiate a new round of review on the existing MR. We recommend that users enable the "Remove source branch when merge request is accepted" option when creating the MR or by editing it. |