Dear Wiki user, You have subscribed to a wiki page or wiki category on "Jclouds Wiki" for change notification.
The "Committers Guide" page has been changed by EverettToews: https://wiki.apache.org/jclouds/Committers%20Guide?action=diff&rev1=6&rev2=7 3. Ensure your name and email address are there as the committer prior to pushing it to the Apache repositories. 4. Always strive for linear commit history, avoid merge commits while pulling in contributor's changes. - == Commiting the changes to the ASF repo == + == Committing the changes to the ASF repo == + === From a GitHub pull request === + + 1. Clone the canonical ASF repo + {{{ + git clone https://git-wip-us.apache.org/repos/asf/jclouds.git + cd jclouds + }}} + 1. Fetch the branch of the user you want to merge from + {{{ + git fetch https://github.com/user-to-merge-from/jclouds.git branch-to-merge-from + }}} + 1. If you commonly merge from a particular user, you'll want to add their repo as a remote to make fetching branches easier. + {{{ + git remote add user-to-merge-from https://github.com/user-to-merge-from/jclouds.git + git fetch user-to-merge-from + }}} + 1. Cherry pick the commit you want to merge + {{{ + git cherry-pick hash-to-merge + }}} + 1. Push the commit (you'll want to setup a .netrc file to make this easy, see [[https://git-wip-us.apache.org/#contents|Committers: Getting Started]]) + {{{ + git push + }}} + + === From a patch file === 1. Save the patch from the Github patch link (just append '.patch' to the pull request link to get it). This patch will keep the authorship of the commit, so we should use it instead of the diff. 2. If the commit message needs to be edited, edit it in the patch file. 3. Pull the changes in the ASF repository to make sure you have the latest version of the master branch.
