Question

merge conflict

0

Hi~ How can i locate the place where is the Specific conflict ,for example a lable or a activity etc. Thanks.

asked 2018-10-30

du liqiang

2 answers

Andreas Blaesius · Answer 1 · 2018-10-30

You can double click on the conflicted item in your changes list. Now the modeler provides more information about it and shows you a before and after compare. I hope that helps.

Austin McNicholas · Answer 2 · 2018-10-30

Hi Du,

A conflict would show in the changes tab in the modeler. You can right click them and choose how to resolve them. Here is a good blog that describes how to do this.

https://www.mendix.com/blog/resolving-commit-conflicts/

If you have a conflict outside of the modeler (for example a sass file). You can use SVN 1.7 to resolve it (make sure to use this specific version).

Hope this helps!