Maybe a late reaction to this post, I did not realize this limitation until today.
This is a TFS/SC limitation that is hard to accept and definitely a merge function that you expect to find in an advanced version contol tool.
If the merge tool traverses the version tree of each file it would find the common anchestor and then a three-way merge could take place.
Will this function be available in a future version (from the GUI)?
|