I want to do a basic reorganization of the code base, but I can’t continue if I cannot provide a way to fix the trunk, which can be easily applied to branches that were made before the reorganization.
One approach that I have been considering is to apply the reorganization to all branches of support, but this will potentially destabilize.
A preferred approach would be to provide a merge tool that can take into account updated file locations. Any suggestions on how I can implement this?
source
share