incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Wiki <wikidi...@apache.org>
Subject [Cordova Wiki] Update of "CommitterWorkflow" by AndrewGrieve
Date Fri, 27 Jul 2012 18:45:00 GMT
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Cordova Wiki" for change notification.

The "CommitterWorkflow" page has been changed by AndrewGrieve:
http://wiki.apache.org/cordova/CommitterWorkflow

New page:
= First Steps =

Congratulations! You've gained the confidence of your fellow Cordova committers and have been
granted the ability to commit code directly, and to apply pull requests from others. You should
receive an email from our Apache mentor with the details of how to setup your account. Once
you've chosen a password, test out your credentials with the following:

{{{
git checkout master
git pull cordova master
git push cordova master
}}}

If all goes well, git push should have asked you for your username and password, and an "Everything
up-to-date" message should have been printed.

= Committing Your Own Changes =
 1. If you are at all in need of reassurance for your change, ask someone to have a look at
it by pushing it your own github clone.
 1. If all is well:
{{{
git checkout master
git pull cordova master
git merge branch_name master
git push cordova master
}}}

= Processing Pull Requests =

== Step 1: Review the change ==
 * View the user's branch in github and request changes be made (if applicable) by adding
comments in the web interface
 * Ensure that commit descriptions are accurate and that they reference any related JIRA bugs.

== Step 2: Merging the change ==
Run the following:
{{{#!sh
git remote add foo git://github.com/TheirUserName/incubator-cordova-docs.git
git fetch foo
git checkout master
git pull cordova master
git merge foo/branch_name
}}}

At this point, the merge will succeed if their branch was up-to-date, or it will require a
merge. If the merge is trivial, then go ahead and do it yourself, otherwise, ask them to pull
+ rebase.
To abort the merge, run:
{{{
git reset --hard HEAD
}}}

== Step 3: Push the change ==

{{{
git push cordova master
git remote rm foo
}}}

== Step 4: Final details ==

 * Update related JIRA issue with the commit ID and close it if appropriate.
 * Respond to pull request on github with link to their commit and ask them to close pull
request.

Mime
View raw message