I went to push some files but got a merge error. I fixed it and went to merge again but got an error that I was no longer in the branch.
I went to switch back to the branch but couldn't; I got an error saying I still needed to merge my changes. Of course if I try to merge the changes I get an error saying I'm not in the right branch. Same if I try to stash.
Would anyone know how I can fix this? Or at least get back to my branch without needing to merge?
When I try to change Branches:
error: you need to resolve your current index first
filename.inc: needs merge
You are not on the correct branch.
# Changes to be committed:
# modified: styles.inc
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
# both modified: filename.inc
git diff filename.incto check if you did merge the file.
git add filename.incto confirm this merge.
git committo commit this merge.