Repository: incubator-beam-site Updated Branches: refs/heads/asf-site 71d95e3b2 -> 6f087916f
Add downstream merge exemption to contribution guide Project: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/commit/caf501b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/tree/caf501b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/diff/caf501b4 Branch: refs/heads/asf-site Commit: caf501b46baa79bcec49606ac1705f8acb3d707c Parents: 71d95e3 Author: Kenneth Knowles <[email protected]> Authored: Thu Oct 27 18:45:07 2016 -0700 Committer: Frances Perry <[email protected]> Committed: Thu Oct 27 22:10:38 2016 -0700 ---------------------------------------------------------------------- contribute/contribution-guide.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/caf501b4/contribute/contribution-guide.md ---------------------------------------------------------------------- diff --git a/contribute/contribution-guide.md b/contribute/contribution-guide.md index e0dd507..88c3884 100644 --- a/contribute/contribution-guide.md +++ b/contribute/contribution-guide.md @@ -289,9 +289,18 @@ Some larger features are developed on a feature branch before being merged into To contribute code on a feature branch, use the same process as above, but replace `master` with the [name of the branch](/contribute/work-in-progress/#feature-branches). -In additional, you'll want to frequently merge in changes from `master` in order to prevent life on the branch from deviating too far from reality. - -Since feature branches are often used for new components, you may find that there is no [committer](/project/team/) familiar with all the details of the new language or runner. In that case, consider asking someone else familiar with the technology to do an initial review before looping in a committer for a final review and merge. +Since feature branches are often used for new components, you may find that +there is no [committer](/project/team/) familiar with all the details of the +new language or runner. In that case, consider asking someone else familiar +with the technology to do an initial review before looping in a committer for a +final review and merge. + +If you are working on a feature branch, you'll also want to frequently merge in +changes from `master` in order to prevent life on the branch from deviating too +far from reality. Like all changes, this should be done via pull request. It +is permitted for a committer to self-merge such a pull request if there are no +conflicts or test failures. If there are any conflicts of tests that need +fixing, then those should get a full review from another committer. #### Merging into Master
