Strange Merge Bug involving numbers

samuel_d_jack · Post by **samuel_d_jack** » Wed Aug 24, 2005 3:55 am

Attached is a screenshot showing what happened when I attempted to merge to AssemblyInfo.cs files containing different version numbers. Rather than picking the numbers from one side or another, Vault seems to have made up its own.

I have seen this happen on other occasions where numbers are involved.

This is obviously not a critical bug, just a strange one!

GregM · Post by **GregM** » Wed Aug 24, 2005 6:15 am

Since you haven't applied either of the sides yet, that was probably the version number from the last version you retrieved before you changed it on your machine.

A merge operation involves three different files, the one you started with, the one you ended up with, and the current one in vault.