ERROR: There are merge conflicts in this project.

0
I have stuck up the below screenshot error, could you please help to fix that error.
asked
1 answers
2

If you go to the changes tab you can select the piece in error and select if you want to use the version from the teamserver (their) or your local version.

 

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

 

answered