Created
October 1, 2012 15:59
-
-
Save jperkin/3812675 to your computer and use it in GitHub Desktop.
git branching plan
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --A-------B-------C--D------------E------F--- origin/trunk | |
| / / / / | |
| --------------------------------------------- upstream/trunk | |
| \ \ | |
| -- upstream/pkgsrc_2012Q2 -- upstream/pkgsrc_2012Q3 | |
| - upstream/trunk is clean pkgsrc HEAD | |
| - origin/trunk tracks upstream/trunk periodically, and adds Joyent-specific changes | |
| - pkgsrc gets branched every quarter | |
| We want to: | |
| - Create quarterly release branches | |
| - Apply changes A-E, preserving history | |
| - Make it easy to cherry-pick F.. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
I can't figure out how to edit comments, but there are some slashes and backslashes with the wrong amount of space before them, and some spelling mistakes.