diff options
| author | Matt Traudt <sirmatt@ksu.edu> | 2017-07-10 14:02:11 -0400 |
|---|---|---|
| committer | Matt Traudt <sirmatt@ksu.edu> | 2017-07-10 14:02:11 -0400 |
| commit | d730449ba25c21b5a251b41d30c36d27aa56f6aa (patch) | |
| tree | 7dec9a9f88a79b38397f7203bc54d90460ea0121 /doc/HACKING/CodingStandards.md | |
| parent | 9e317641f9b13c4fd8aa2be3e7fbb1a447ecc324 (diff) | |
| download | tor-d730449ba25c21b5a251b41d30c36d27aa56f6aa.tar.gz tor-d730449ba25c21b5a251b41d30c36d27aa56f6aa.zip | |
Add more details about git branch use in tor
Diffstat (limited to 'doc/HACKING/CodingStandards.md')
| -rw-r--r-- | doc/HACKING/CodingStandards.md | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md index 1955434b0a..2599c3ec69 100644 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@ -62,8 +62,17 @@ before it gets merged into maint, but that's rare. If you're working on a bugfix for a bug that occurs in a particular version, base your bugfix branch on the "maint" branch for the first supported series -that has that bug. (As of June 2013, we're supporting 0.2.3 and later.) If -you're working on a new feature, base it on the master branch. +that has that bug. (As of June 2013, we're supporting 0.2.3 and later.) + +If you're working on a new feature, base it on the master branch. If you're +working on a new feature and it will take a while to implement and/or you'd +like to avoid the possibility of unrelated bugs in Tor while you're +implementing your feature, consider branching off of the latest maint- branch. +_Never_ branch off a relase- branch. Don't branch off a tag either: they come +from release branches. Doing so will likely produce a nightmare of merge +conflicts in the ChangeLog when it comes time to merge your branch into Tor. +Best advice: don't try to keep an independent branch forked for more than 6 +months and expect it to merge cleanly. Try to merge pieces early and often. How we log changes |