How to resolve one or more conflicts. Please use an external tool to resolve this conflict?

0
Hi Experts,   Can anybody please help me out why this error is occurring? and how I can resolve the same? I have attached a screenshot below. This error occurred while taking merge from mainline into my current branch line.    Regards, Simran.
asked
1 answers
0

Hey Simran!

 

You need to download ToroiseSVN or TortoiseGit depending on your repository to resolve external conflicts like these.

Once you install it you will need to restart and then you can leverage the conflict resolution with this

 

Read more here:

https://community.mendix.com/link/space/deployment/questions/92516

 

Hope this helps!

answered