Update to merge instructions.

Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-apex-site/commit/82849538
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/82849538
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/82849538

Branch: refs/heads/master
Commit: 828495383ebb8822a80dcafaad61e18d50b4a234
Parents: 0344d70
Author: Thomas Weise <[email protected]>
Authored: Tue Jan 5 22:48:24 2016 -0800
Committer: Thomas Weise <[email protected]>
Committed: Tue Jan 5 22:48:24 2016 -0800

----------------------------------------------------------------------
 src/md/contributing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/82849538/src/md/contributing.md
----------------------------------------------------------------------
diff --git a/src/md/contributing.md b/src/md/contributing.md
index 5f454dc..1be6909 100644
--- a/src/md/contributing.md
+++ b/src/md/contributing.md
@@ -117,6 +117,6 @@ Thanks for contributing!
 1. Use the git command line to pull in the changes from the pull requests. You 
can refer to the corresponding email that will be automatically sent to the 
`[email protected]` mailing list to see the exact commands to 
merge the given pull request.
 1. Once done with verification, push the changes to the ASF repository's 
`devel-3` branch. Within a few
 seconds, the changes will propagate back to the github mirror and the pull 
requests be closed and marked merged automatically.
-1. The `Fix version` field on the corresponding JIRA ticket needs to be set 
after pushing the changes.
+1. The `Fix version` field on the corresponding JIRA ticket needs to be set 
and the ticket resolved after pushing the changes.
 
 **Note: since none of us has write access to the mirror, only the author of a 
pull request can close it if it was not merged.**

Reply via email to