I have Subversion repository with the following structure trunk - production code; branches/PreProdValidation - pre-production; branches/IntegrationTesting - UAT; branches/developerA - developer code branch
The workflow is from branches/developerA to IntegrationTesting to PreProdValidation and eventually to trunk.
I have multiple developers working on the project each with their own repo branch, e.g. branches/developerA, branches/developerB, etc.
This is working fine except keeping the developer branches up to date with changes going into IntegrationTesting. Looking for recommendations on how to merge, or update, the developer branches with changes in IntegrationTesting, e.g. changes made by the other developers. I thought a standard merge from IntegrationTesing back into their respective branch would work but I receive errors regarding re-integration.
Suggestions?
Our community of experts have been thoroughly vetted for their expertise and industry experience.