Tutorial/Video on Resolving Merge Status?

neal007 · Post by **neal007** » Mon May 05, 2008 8:34 am

Hello,

I'd like to request a tutorial/article/video on resolving merge status. I've seen this in the past few weeks with our growing team of developers and also with the setting of the .vbproj/.csproj types as mergeable to prevent the exclusive lock issues. We get the failed check-in check message pane which is a bit confusing, especially for those that don't have that window docked or in view, it should be presented to them at the time of a failed check-in, but when you see the merge status in red and view the options, it is utterly confusing as to what to do. I open a busy diff window and don't see any options or ways to handle the merging, it is simply not intuitive. The end result is always "resolve merge status" i.e. let it do what it wants to do, I don't have a vote here!

So hopefully you can see, from me at least, this process is extremely confusing and I don't know what the heck to do in order to work with a merge conflict. Please provide some type of training for me and others so we know how to use your systems in place and properly handle this situation.

Thank you.

lbauer · Post by **lbauer** » Mon May 05, 2008 9:11 am

Thanks for the suggestion. We have just started doing short video tips and demos:
http://www.sourcegear.com/fortress/video/

and we will add this to the list of things to do.

neal007 · Post by **neal007** » Mon May 05, 2008 9:16 am

Thanks Linda. Please reply to this thread when it is available so I can get a notification and review it and also send the link to my devs as well.

lbauer · Post by **lbauer** » Mon May 05, 2008 9:58 am

Will do.