Request for same level as VSS Merge confict editor (Please)

George Mills · Post by **George Mills** » Sun Dec 19, 2004 11:41 am

I just upgraded to V3.0.1 and everything is looking great.

The lack of a merge conflict tool (that allows you to EDIT) is the only thing that may be an obstacle to my recommendation of rolling this out across our company.

Please, please put this high on your V3.1 list.

It will be a much easier sell.

Adam · Post by **Adam** » Wed Jan 05, 2005 11:55 am

I had the same problem and did some searching and Perforce lets you use their merge tool. In the Vault GUI client you can go to options and change the command-line used to launch the merge.

dan · Post by **dan** » Wed Jan 05, 2005 3:11 pm

This is definitely on our list, and we are currently working on a merge tool that allows editing. As Adam points out, until then, you would need to specify a different merge tool in your Vault options.

George Mills · Post by **George Mills** » Fri Jan 07, 2005 11:08 am

Wait a minute, I'm confused. The link below gives me the impression that a merge conflict Pane can be edited?

http://support.sourcegear.com/viewtopic.php?t=2670

It's not clear if you can turn on editing in the middle Pane though. But you can turn on, left or right pane.

dan · Post by **dan** » Fri Jan 07, 2005 11:31 am

It depends on your definition of "editing"

The middle pane can always be modified by moving changes from the left and right panes into it. However, it can't be hand-edit by typing in characters. The only way to "edit" it currently is to move known changes into it.

George Mills · Post by **George Mills** » Fri Jan 07, 2005 4:27 pm

Got it, thanks.

P.S. Demo to a mix of VSS and cvs developers turned a few heads. I ported a VSS project in a DEMO !!! Very impressive. Nice work guys.

dan · Post by **dan** » Fri Jan 07, 2005 4:49 pm

Glad it well well - thanks for the good feedback