When I attempt to pull from my local Azure GIT branch into the dev branch, I get this message:
The only choice it gives me is to abandon it in a blue button further to the right.
When I try to manually edit it and try again, I continue to get this message.
I even tried deleting the dev file, and pulling.
Then I tried creating that file in dev and copying the contents of that file directly from my local branch. Azure continues to bark that there is a conflict.
The following images taken from Visual Studio might be helpful:
So, what I'm trying to do is to update the dev branch (lrs_dev) with the code I've been working on in my local branch (lrs_Babak).
I'm considering reverting the history in the lrs_dev which are associated with the conflict.