Resolve Merge Conflict

0
Hi everyone, I have a POC project with Mendix, and it involves several developers. I'm using Git Server to manage version control. Upon pulling the latest source code, we encountered an error related to a .bak file: CONFLICT (content): Merge conflict in pms-poc.mpr.bak Automatic merge failed; fix conflicts and then commit the result. Does anyone have an idea about this situation? Thanks
asked
3 answers
0

Yup, kindly use tortoise git

https://tortoisegit.org/download/

answered
2

Hey!

 

 Best to resolve external conflicts using TortoiseSVN download TortiseSVN v 1.7

Read more here

 

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

answered
0

Hi @Ritika,

I'm using Git to manage the version. Do you have any solution for this siutation?

Thanks

answered