Changes between Version 89 and Version 90 of DeveloperGuidelines/Git
- Timestamp:
- 01/03/14 03:48:08 (11 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
DeveloperGuidelines/Git
v89 v90 270 270 === Getting your changes accepted into the trunk repository === 271 271 272 Before submitting code to be included in the trunk repository, twothings should be done:272 Before submitting code to be included in the trunk repository, several things should be done: 273 273 1. Rebase from trunk and deal with any merge conflicts. 274 274 1. Squash all commits in your change into one commit. This removes any false steps and re-working, and packages the related work together. 275 1. Test after rebasing. 276 1. Push your changes to your own fork of Eden on GitHub. 277 1. Ask for a code review if appropriate. 278 279 Once you are ready to submit your work, make a pull request: Click Pull Requests on the right side of the GitHub page for your repo then the New Pull Request button. Note if you already have a pull request open, then changes you push to the branch that is the source of the pull request will be included in it automatically -- you do not need to close the pull request and make a new one. 275 280 276 281 === Working with multiple branches ===