Merge Brances - Bringing over new files

If you are having a problem using Vault, post a message here.
Post Reply
porterr
Posts: 7
Joined: Tue Jan 04, 2011 10:55 am

Merge Brances - Bringing over new files

Post by porterr » Thu Jun 26, 2014 11:37 am

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?

Beth
Posts: 8550
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
Contact:

Re: Merge Brances - Bringing over new files

Post by Beth » Thu Jun 26, 2014 2:13 pm

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.
Beth Kieler
SourceGear Technical Support

Post Reply