How to resolve conflicts..

jonatec

Hi

Did "Get Latest" and it returned about 40 conflicts.

If I choose the "Take theirs" - how do I actually get is to implement the change, what button/link/icon to commit the change ?

Anu D

Thanks for your post.

When you select 'Take theirs' you need to click on 'Commit' button and then
Your changes are discarded, and the database is updated to the latest source control version.

Does this answer your question?