I am trying to do a merge squash from a devel branch into the master.
stefanos-imac:trunk borini$ git merge --squash devel
CONFLICT (content): Merge conflict in test1
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 2224 and retry the command.
Squash commit -- not updating HEAD
Automatic merge failed; fix conflicts and then commit the result.
fair enough.
stefanos-imac:trunk borini$ git config merge.renameLimit 999999
Then I try to undo the merge and redo it with the higher limit
stefanos-imac:trunk borini$ git merge --abort
fatal: There is no merge to abort (MERGE_HEAD missing).
Ok, so maybe I have to do as it says and just reinvoke the merge command
stefanos-imac:trunk borini$ git merge --squash devel
fatal: 'merge' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>' as
appropriate to mark resolution and make a commit, or use 'git commit -a'.
oh git, why are you such a git?
More to the point, does anyone know how to get out of this situation ?
Em,
git reset --hard origin/master?