What is Merge Conflicts?



What is Merge Conflicts?..

Answer / Preeti Mishra

Merge Conflicts occur in version control systems when multiple users make changes to the same location within a file, causing inconsistencies that cannot be automatically resolved. The user responsible for resolving the conflicts must manually address and resolve any differences between the versions.

Is This Answer Correct ?    0 Yes 0 No

Post New Answer

More VSS Interview Questions

Which version of sql server does source any where support?

1 Answers  


What’s Analyze?

1 Answers  


How do I display a custom message box during Add Item, Check In, Ckeck Out, Undo Checkout, Branch, and Rename?

1 Answers  


Are the any windows shell extensions for SourceSafe?

1 Answers  


What is Merge Conflicts?

1 Answers  


How does one implement SourceSafe integration with FrontPage 2000/ 8?

1 Answers  


I've checked out and modified my files. At what point do the copies stored in the Visual SourceSafe database get updated?

1 Answers  


Is there a way to enable easily switching between multiple source code providers?

1 Answers  


can database be accessed without sharing the folder.

2 Answers  


Are there any patches available for problems that occur when using VSS on a Novell share?

1 Answers  


Where can I find a list of known bugs in VSS?

1 Answers  


Is VSS Y2K compliant?

1 Answers  


Categories