Repository: beam-site Updated Branches: refs/heads/asf-site 6b3775494 -> 3b3bc65c2
Simplify merge process section Project: http://git-wip-us.apache.org/repos/asf/beam-site/repo Commit: http://git-wip-us.apache.org/repos/asf/beam-site/commit/9a89089e Tree: http://git-wip-us.apache.org/repos/asf/beam-site/tree/9a89089e Diff: http://git-wip-us.apache.org/repos/asf/beam-site/diff/9a89089e Branch: refs/heads/asf-site Commit: 9a89089e8a8c27339711a2ff61a17a5c7a1875fb Parents: 6b37754 Author: Zur, Aviem <[email protected]> Authored: Sun Mar 19 06:16:49 2017 +0200 Committer: Davor Bonaci <[email protected]> Committed: Mon Mar 20 09:18:10 2017 -0700 ---------------------------------------------------------------------- src/contribute/contribution-guide.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam-site/blob/9a89089e/src/contribute/contribution-guide.md ---------------------------------------------------------------------- diff --git a/src/contribute/contribution-guide.md b/src/contribute/contribution-guide.md index c1617af..74ee879 100644 --- a/src/contribute/contribution-guide.md +++ b/src/contribute/contribution-guide.md @@ -344,9 +344,7 @@ Once you are ready to merge, fetch all remotes, checkout the destination branch $ git fetch --all $ git checkout apache/master - $ git merge --no-ff \ - -m $'[BEAM-<JIRA-issue-#&>;</b>] <Title>\n\nThis closes #<pull-request-#>' \ - finish-pr-<pull-request-#> + $ git merge --no-ff -m 'This closes #<pull-request-#>' finish-pr-<pull-request-#> Always use `--no-ff` option and the specific commit message "This closes #<pull request #>" -- it ensures proper marking in the tooling. It would be nice to include additional information in the merge commit message, such as the title and summary of the pull request.
