One or more files are confliced error

1
“One or more files are conflicted. Please use an external tool to resolve these conflicts.” This error is occuring when commiting changes.  Can anyone tell me how to resolve it? Find below attachment for the same.
asked
2 answers
2

Hello Aishwarya Gorane,

You can refer this blog on resolving commit conflict: https://www.mendix.com/blog/resolving-commit-conflicts/

 

Hope my answer helps.

answered
1

Hello Aishwarya,

Take an update from the Team server and try committing, if the same error occurs use SVN to resolve your Conflicts. 

Refer these links for more Information :
https://forum.mendix.com/link/space/deployment/questions/92516

https://forum.mendix.com/link/space/other/questions/99603

https://forum.mendix.com/link/space/studio-pro/questions/102700

 

 

 

answered