Merge Brances - Bringing over new files
Merge Brances - Bringing over new files
Is there a way to 'Detect New Files' and bring them over(copy) to a Branched Code base when performing a merge between 2 branches?
Re: Merge Brances - Bringing over new files
During a Merge Branches, if you selected the change set that included the Add action that originally happened on the file, then that file will be added to the side you are merging to. If the files are not in Vault, they can't be detected during Merge Branches, and if the Add action isn't part of any of the change sets selected, then the file won't be added.
When you select what changes to put into the merge, each line represents a change set with certain actions. The merge then applies those actions to the target. Vault doesn't perform a Diff to see what's different between the two.
When you select what changes to put into the merge, each line represents a change set with certain actions. The merge then applies those actions to the target. Vault doesn't perform a Diff to see what's different between the two.
Beth Kieler
SourceGear Technical Support
SourceGear Technical Support