Triggering 'Needs Merge' during Merge Branches

[zolondek]

If two different versions of the same file exist in Branch 1 and Branch 2, shouldn't the Merge Branches wizard (with 'attempt automatic merge' unchecked) indicate a 'Needs Merge' (while merging Branch 1 to Branch 2)?

For example, Branch 1.File A contains the text ‘abc’. Branch 2.File A contains text on the same line but it says ‘def’. Perform Merge Branches using Branch 1 as the Origin and Branch 2 as the Target. Shouldn’t I get a ‘Needs Merge’ indication on File A? I am getting an ‘Add File’ operation for File A which is not what I would expect.

Thanks.

[lbauer]

What version of Vault are you using?

Are Branch1 and Branch2 from the same trunk, or is Branch2 a branch of Branch1?

[lbauer]

I tried a few different ways of branching, but was not able to get an "Add" instead of a "Needs Merge" state.

Steps to reproduce would be helpful.

[zolondek]

I tried a few different ways of branching, but was not able to get an "Add" instead of a "Needs Merge" state.

Steps to reproduce would be helpful.

We were trying to re-create a legacy project in Vault by copying in code directly into manually created branches. So there was not a branch history.

When we restarted with a trunk and then used Vault to create the branches, we successfully got files that triggered the ‘Merge Conflict’ status.

Thanks.

[lbauer]

Merge branches was designed to merge change sets. In other words, it merges folder history, not just the contents of two directories.

Most likely, you added files to Branch 1 then you used Branch 1 as origin and Branch 2 as the target. The folder history for Branch 1 had the "add" operation, so that's what the merge tool was trying to merge into Branch 2, but those file names were already there.

I was able to reproduce this. If you tried merging Branch 2 as origin and Branch 1 as target, then you would've gotten the merge conflict. Still, you'll get more predictable results if you actually use the branch operation to create your branch.

[zolondek]

That makes sense. We're now using the branch operation to create branches and merging works fine now.

Thanks!

Merge branches was designed to merge change sets. In other words, it merges folder history, not just the contents of two directories.

Most likely, you added files to Branch 1 then you used Branch 1 as origin and Branch 2 as the target. The folder history for Branch 1 had the "add" operation, so that's what the merge tool was trying to merge into Branch 2, but those file names were already there.

I was able to reproduce this. If you tried merging Branch 2 as origin and Branch 1 as target, then you would've gotten the merge conflict. Still, you'll get more predictable results if you actually use the branch operation to create your branch.

[lbauer]

You're welcome.