mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
doc/HACKING: Improve documentation of how to bump version in maint
See discussion on 9553: Some of the build scripts don't like it when you can't merge maint into release.
This commit is contained in:
parent
268a117cdf
commit
29f2f7ce9a
@ -539,5 +539,7 @@ changelog to tor-talk or tor-announce.
|
||||
|
||||
13) If it's a stable release, bump the version number in the maint-x.y.z
|
||||
branch to "newversion-dev", and do a "merge -s ours" merge to avoid
|
||||
taking that change into master.
|
||||
taking that change into master. Do a similar 'merge -s theirs'
|
||||
merge to get the change (and only that change) into release. (Some
|
||||
of the build scripts require that maint merge cleanly into release.)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user