Conflict of Widget?

0
Hello, I am cooperating with the team working on Mendix 10.12. When I pulled the version from the cloud, I encountered a conflict error. How can I fix it? Thank you very much!
asked
2 answers
1

You need to download TortoiseGit from an external website if you want to use this to handle the conflict.

 

https://tortoisegit.org/download/

 

If you get stuck, you can find a lot more detail on the handling conflicts in the documentation.

 

https://docs.mendix.com/refguide/merge-algorithm/

 

I hope this helps. Good luck!

answered
0

Hi Yuan,

First download & install tortoise git tool from chrome.

 

go to mendix -> select your conflict file and click on open containing folder ( you can directly open the folder by clicking on app & show file directory)

-> after opening folder right click at empty area -> Show more -> click on tortoise git-> click on resolve 

 

It will resolve the your conflict.

answered