Dear Wiki user, You have subscribed to a wiki page or wiki category on "Hadoop Wiki" for change notification.
The "HowToCommit" page has been changed by EricYang: https://wiki.apache.org/hadoop/HowToCommit?action=diff&rev1=39&rev2=40 1. Set the assignee if it is not set. If you cannot set the contributor to the assignee, you need to add the contributor into Contributors role in the project. Please see [[#Roles|Adding Contributors role]] for the detail. This How-to-commit [[http://www.youtube.com/watch?v=txW3m7qWdzw&feature=youtu.be|video]] has guidance on the commit process, albeit using svn. Most of the process is still the same, except that we now use git instead. + + ==== Merging a feature branch ==== + When merging a feature branch to trunk, use no fast forward option to provide a single commit to digest history of the feature branch. Commit history of feature branch will remain in feature branch. + {{{ + # Start a new feature + git checkout -b new-feature trunk + # Edit some files + git add <file> + git commit -m "Start a feature" + # Edit some files + git add <file> + git commit -m "Finish a feature" + # Merge in the new-feature branch + git checkout trunk + git merge --no-ff new-feature + }}} <<Anchor(Documentation)>> ==== Committing Documentation ==== --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
