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 touched in my branch. > > Curious I open the file, expecting to see the merge conflicts highlighted, > eg: *<<<<HEAD *but it appears clean and fine. > > I do not have access to the remote repo on Github so I cannot inspect > 'their' file to see the differences. > > I attempted to `git checkout --theirs file/name` but got an error: unable > to unlink old 'file/name' (Permission denied) > > I attempted to move out of the branch to try and start again but got an > error saying I had merge conflicts to resolve. > > I don't want to `git add` my version of the file, because I can't tell if > it's correct or not. > > What is the best course of action here? > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
