asked on
I have Subversion repository with the following structure trunk - production code; branches/PreProdValidation
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?
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?
Learn from the best
Network and collaborate with thousands of CTOs, CISOs, and IT Pros rooting for you and your success.
Andrew Hancock - VMware vExpert
See if this solution works for you by signing up for a 7 day free trial.
Unlock 1 Answer and 3 Comments.
Try for 7 days”The time we save is the biggest benefit of E-E to our team. What could take multiple guys 2 hours or more each to find is accessed in around 15 minutes on Experts Exchange.
Our community of experts have been thoroughly vetted for their expertise and industry experience.