Commit issue

0
After taking update, i'm getting conflict but the changes tab does not show any conflicts. I'm unable to merge my code and commit my changes
asked
1 answers
0

Hi Shivangi,

This happens when there is a network issue or merge issue, and the mpr files is not able to recognise the merge changes.

This can be resolved by using an external tool, or using Git command line, for the same.

for ex. you can use Tortoise git, and resolve the changes.

 

Hope it helps!

answered