Help in solving a merge conflict error

0
Hi,  I’m quite a newbie so solving errors here is currently beyond my skills.  I got a merge conflict error and I can’t understand what do I need to do in order to fix it.  Here are 2 screenshots, one with the error the other one with the details. 
asked
3 answers
1

Hi Efry,

Please find the below links to resolve the conflicts

https://docs.mendix.com/refguide/using-version-control-in-studio-pro

https://www.mendix.com/blog/resolving-commit-conflicts/#:~:text=When%20changes%20are%20made%2C%20the,may%20result%20in%20a%20conflict.

 

answered
1

When merge conflicts concern microflows, snippets and pages my way of working is always to duplicate my version of the document, use resolve using theirs to get their changes and then compare the changes and and make the necessary adjustments. Don't forgot to exclude or delete the duplicate before committing everything again.

answered
0

Thank you both.

answered