You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by me...@apache.org on 2017/12/07 01:59:30 UTC
[beam-site] branch mergebot updated (d05405e -> 747a3f0)
This is an automated email from the ASF dual-hosted git repository.
mergebot-role pushed a change to branch mergebot
in repository https://gitbox.apache.org/repos/asf/beam-site.git.
discard d05405e This closes #346
discard a0d1cf1 Add Reuven Lax as PMC member.
new 406109f Add a note about GitHub merge button
new 747a3f0 This closes #359
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d05405e)
\
N -- N -- N refs/heads/mergebot (747a3f0)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/_beam_team/team.md | 2 +-
src/contribute/contribution-guide.md | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@beam.apache.org" <co...@beam.apache.org>'].
[beam-site] 01/02: Add a note about GitHub merge button
Posted by me...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mergebot-role pushed a commit to branch mergebot
in repository https://gitbox.apache.org/repos/asf/beam-site.git
commit 406109f1842d8660cc1c8e59014bf2612dcd736e
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sun Dec 3 15:20:16 2017 +0100
Add a note about GitHub merge button
---
src/contribute/contribution-guide.md | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/contribute/contribution-guide.md b/src/contribute/contribution-guide.md
index 6df6252..cc539bd 100644
--- a/src/contribute/contribution-guide.md
+++ b/src/contribute/contribution-guide.md
@@ -308,7 +308,7 @@ From another local branch, run:
The community will close stale pull requests in order to keep the project healthy. A pull request becomes stale after its author fails to respond to actionable comments for 60 days. Author of a closed pull request is welcome to reopen the same pull request again in the future. The associated JIRAs will be unassigned from the author but will stay open.
## Commit (committers only)
-Once the code has been peer reviewed by a committer, the next step is for the committer to merge it into the [authoritative Apache repository](https://gitbox.apache.org/repos/asf/beam.git), not the read-only GitHub mirror. (In the case that the author is also a committer, it is acceptable for either the author of the change or committer who reviewed the change to do the merge. Just be explicit about whose job it is!)
+Once the code has been peer reviewed by a committer, the next step is for the committer to merge it into the [authoritative Apache repository](https://gitbox.apache.org/repos/asf/beam.git) or [GitHub](https://github.com/apache/beam). (In the case that the author is also a committer, it is acceptable for either the author of the change or committer who reviewed the change to do the merge. Just be explicit about whose job it is!)
Pull requests should not be merged before the review has received an explicit LGTM from another committer. Exceptions to this rule may be made rarely, on a case-by-case basis only, in the committer’s discretion for situations such as build breakages.
@@ -383,6 +383,14 @@ At this point, you want to ensure everything is right. Test it with `mvn verify`
Done. You can delete the local `finish-pr-<pull-request-#>` branch if you like.
+It's also possible to use the "Merge Pull Request" button on GitHub, supporting three modes:
+
+* Merge
+* Squash & Merge
+* Rebase & Merge
+
+It's similar to do the merge by hand.
+
## Granting more rights to a contributor
The project management committee (PMC) can grant more rights to a contributor, such as commit access or decision power, and recognize them as new [committers or PMC members]({{ site.baseurl }}/contribute/team/).
--
To stop receiving notification emails like this one, please contact
"commits@beam.apache.org" <co...@beam.apache.org>.
[beam-site] 02/02: This closes #359
Posted by me...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mergebot-role pushed a commit to branch mergebot
in repository https://gitbox.apache.org/repos/asf/beam-site.git
commit 747a3f08ff6b24f0f7046ab4c28bef16c19c223f
Merge: 07b03c1 406109f
Author: Mergebot <me...@apache.org>
AuthorDate: Thu Dec 7 01:56:10 2017 +0000
This closes #359
src/contribute/contribution-guide.md | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
"commits@beam.apache.org" <co...@beam.apache.org>.