Dynamsoft Forums

Hi there!

Currently, i have a project where there is 2 programmer cehck-out & editing the same vb file.
During check-in, we have option to merge the file, and definitely either or will lose their codes if the codes overlap.
Is it possible before the merge, the programmer can call a function somewhere in VS to compare their local code with the master version?

I found a link for web editing, but can't find one for visual basic.
http://msdn.microsoft.com/en-us/library ... 60%29.aspx

Any ideas and comments are appreciated.

Hi AmazingTrans,


For merge-able files like *.c, *.html, *.vb, if 2 files have any conflicts, VSS will display the Visual Merge window when you try to check in 1 copy after the other copy has been checked in. Just as you can see in the link http://msdn.microsoft.com/en-us/library ... 60%29.aspx. So you will need to decide which modifications stay in the final version.


I think you are talking about "Show Difference"?