Merge conflicts

How to manage and solve conflicts while commiting or updating to team server?
2 answers

Hi Arpita,

To avoid conflicts as much as possible I would recommend committing your work oftenly and communicating with your team when working on features in the same domain model.

However if you do get conflicts, you can go to the changes tab in the bottom of the page and you will see them displayed there. You can right click on a conflict and select use mine or use theirs, to keep one of the two version. I would recommend you speak to your teammates, to see how big their changes are compared to yours, keep the biggest changes and then reimplement the smallest change.

Hope this helps!


In addition to Matteo’s answer, you should use Tortoise SVN to resolve conflicts present in the styling or other non-studio pro files.