Re: [git-users] Merging my branch into a remote repo, I encounter a merge conflict with a file I have not touched in my branch. What is the best course of action?

AD S writes: > I am in the process of merging my branch into a remote repo (that > others contribute to as well). > > I get a merge error on a file I have not touched in my branch. > > Curious I open the file, expecting to see the merge conflicts > highlighted, eg: *<<< >

[git-users] Merging my branch into a remote repo, I encounter a merge conflict with a file I have not touched in my branch. What is the best course of action?

I am in the process of merging my branch into a remote repo (that others contribute to as well). I get a merge error on a file I have not touched in my branch. Curious I open the file, expecting to see the merge conflicts highlighted, eg: *<<