lojikl Posted March 14, 2011 Report Share Posted March 14, 2011 Hi, We're having all sorts of delays and issues with Merging... It would be great if for some projects we could cofigurethe server to force Exclusive checkouts. Any chance of doing this ?. Link to comment Share on other sites More sharing options...
psantosl Posted March 14, 2011 Report Share Posted March 14, 2011 Can you explain us a little bit more about the kind of issues you have with merging? Link to comment Share on other sites More sharing options...
lojikl Posted March 14, 2011 Author Report Share Posted March 14, 2011 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 More sharing options...
psantosl Posted March 15, 2011 Report Share Posted March 15, 2011 Hi, Manual editing is actually doable on the merge tool... you can edit on the lower panel. Could you send us the files (or a similar example) so we can see how WinMerge behaves better so we can improve our tool? Thanks, pablo Link to comment Share on other sites More sharing options...
lojikl Posted March 15, 2011 Author Report Share Posted March 15, 2011 Ok, thats great, but any chance we can have an option to force exclusive checkouts at the Repo level. Then your toll will offer the best of both worlds !! Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.