Open vmsh0 opened 1 year ago
In case it might be useful, this is the output of git reset --merge
right after the crash:
contiki-sensinode on (git)-[0e5ccf2f357f39c301939421a7017aff59fccb7c|merge]- [=✘»!+?]
➜ git reset --merge
error: Entry 'tools/cooja/java/org/contikios/cooja/util/CCITT_CRC.java' not uptodate. Cannot merge.
fatal: Could not reset index file to revision 'HEAD'.
I suspect that the .gitattributes
file that has a conflict for the current merge might have something to do with the issue:
<<<<<<< HEAD
.gitignore export-ignore
.gitattributes export-ignore
=======
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto whitespace=trailing-space
# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.c text
*.h text
*.java text
# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
>>>>>>> 61a5d234eb659234e1ef6db1026b88b0a8643c1e
However, even changing it and trying to continue the merge results in the crash happening again and the .gitattributes
file being restored to the version above.
Hi,
git-imerge
crashes when attempting to continue an incremental merge. The crash looks as follows:git status
after the crash (very long, sorry for the external link): https://paste.sr.ht/blob/b466f3ca90050fbd8e2cf23cf7af716096c1ce46Is it possible to recover from this situation? I've been working on this merge for a few days now, my current priority is not to lose the work I've done so far.