Conflicts When Merged Branch with Main

0
Hi i have problem when try merge Branch from my team   how to solve this?
asked
2 answers
1

Hi, 

 

I'm guessing that you have not touched these java actions as they seem to come from oql module. Check if you can see 2 OQL modules in your app. If you do, delete the older one. Once conflict is resolved reimport latest version of OQL just in case. Otherwise, you can refer to Mendix documentation on how to resolve merge conflicts. 

 

Regards

answered
0

This means that somebody else of your team also made changed to the same Java code. You have to decide which version of the Java code should win.

See also the documentation: https://docs.mendix.com/refguide/merge-algorithm/

Regatds,

Ronald

answered