Explanatory Question
How to Merging code and resolving code conflicts
Read the answer carefully and go through the related questions on the right side to improve your understanding of this topic.
Sometimes, when you get the latest code from a branch into Visual Studio, the code stored on the server has changes that are different from the changes that you made locally. This is a merge conflict.
When Visual Studio encounters a merge conflict, it attempts to resolve it automatically. Any such resolution is in the output log. If any conflicts fail to resolve automatically, they appear in a new window that prompts you to tell Visual Studio what it should do for each conflicting file.
The Resolve Conflicts window gives you the following options for each file:
You can't check in a changeset until there are no unresolved merge conflicts, so mastering these tools is key to your success as a member of a development team.
First read the answer fully, then try to explain it in your own words. After that, open a few related questions and compare the concepts. This method helps you remember the topic for a longer time and improves exam preparation.