Use an external tool to resolve file conflicts.

0
Hi Team,   I get this error after merging out hotfix branches back into our mainline (for the 2nd time)   so I found SmartSVN is there a button I can press to resolve all of these file issues, as I haven't touched or changed any of them. Accept all changes or something?  
asked
1 answers
1

Hi Jason,

I never tried SmartSVN tool but i tried tortoise git external tool, Install tortoise git.

Show file directory from mendix > right click at empty area > Show more options > Tortoise Git > resolve 

After clicking resolve it will resolve all the conflicts.

 

Hope you like the answer.

answered