I adjusted 2 files and went to merge them to Github. However, when I run a push I get an error:
Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
# deleted by us: somefolder/somefile.ext
However, I have not touched this file. When looking at my local directory I see the file is still very much intact.
Would anyone know why this is occurring and what I can do about it?