Merge conflicts

can anyone please let me know how to solve this error
1 answers

Hi Bharath Masina, if you con directly to the “Changes” tab at the left of “Errors” you will see that u have 187 changes. I assume you merge branches and since there are differences on the same element (for example you work on x page and the other person working on the other branch also did changes in that page and elements), so you basically need to solve this conflicts by choose wich option you will leave.