Jump to content

Exclusive Checkout


Recommended Posts

Hi,

Well there were two of us working on a single file. We checked in and the second person was asked to merge. So far so good.

The changes we made were very simple, text based changes but the Merge tool just couldn't find the correct change/deletion/insertion points and no matter what we tried, the resultant file was a mess.

Now, I admit that perhaps the devs needed to look at the merging more closely but I do not have time to over seas all the merges and wish to force an Exclusive checkout on the some of the Repositories....

As a point of interest, WinMerge seemed to pick up the changes much easier, but still required manual editing. Perhaps manual editing would be possible in the Merge tool, but to be honest it just causes us more work.

Cheers.

Link to comment
Share on other sites

Archived

This topic is now archived and is closed to further replies.

×
×
  • Create New...