[git-users] Re: 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 think I found the problem: it was a change in permissions, not the actual code On Wednesday, March 1, 2017 at 11:14:21 AM UTC+10, AD S wrote: > > 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

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: *<<< >