Changes between Version 1 and Version 2 of Ticket #12358, comment 1
- Timestamp:
- Mar 7, 2016, 12:20:54 AM (8 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Ticket #12358, comment 1
v1 v2 1 TODO: I'm considering modifying TracDev/DevelopmentWorkflow#Integrationinreleasebranches. In the time I've been involved with the project I've never seen anyone //port all pending changes// between branches, although I can't definitely say this hasn't happened since we don't have full visibility into the client-side operations. Instead, we seem to always do cherry-pick merges: `svn merge -c uvw,yxz ^/branches/1.0-stable .`1 DONE: I'm considering modifying TracDev/DevelopmentWorkflow#Integrationinreleasebranches. In the time I've been involved with the project I've never seen anyone //port all pending changes// between branches, although I can't definitely say this hasn't happened since we don't have full visibility into the client-side operations. Instead, we seem to always do cherry-pick merges: `svn merge -c uvw,yxz ^/branches/1.0-stable .` 2 2 3 3 DONE: It would also be good to document the process for committing work from a Git repository to SVN (comment:11:ticket:11189).
