Update dev branches in Subversion
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?
ASKER
Thanks again.
Version control, also known as revision control or source control, is the management of changes to documents, computer programs, large web sites, and other collections of information. Changes are usually identified by a number or letter code, termed the "revision number," "revision level," or simply "revision." Version control systems (VCS) most commonly run as stand-alone applications, but revision control is also embedded in various types of software such as word processors and spreadsheets, and in various content management systems. Revision control allows for the ability to revert a document to a previous revision. Git, a widely-used VCS, has its own topic; other popular systems include CVS, Subversion, Team Foundation Server (TFS), Visual SourceSafe (VSS) and Perforce.
TRUSTED BY
You can find here how to migrate https://git-scm.com/book/en/v2/Git-and-Other-Systems-Migrating-to-Git
Here you can find inspiration on what workflow may be the most suitable for you https://git-scm.com/book/en/v2/Distributed-Git-Distributed-Workflows