Avatar of Babak Sekandari
Babak Sekandari
Flag for United States of America asked on

How to resolve pull conflict in Azure GIT and Visual Studio

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.

Any suggestions?

AzureGitMicrosoft Visual Studio

Avatar of undefined
Last Comment
Babak Sekandari

8/22/2022 - Mon
Babak Sekandari

View this solution by signing up for a free trial.
Members can start a 7-Day free trial and enjoy unlimited access to the platform.
See Pricing Options
Start Free Trial
Ask your own question & get feedback from real experts
Find out why thousands trust the EE community with their toughest problems.
Experts Exchange has (a) saved my job multiple times, (b) saved me hours, days, and even weeks of work, and often (c) makes me look like a superhero! This place is MAGIC!
Walt Forbes