Crash: Reload after editor failed

[nullromo]

This tool looks promising! I like the simplistic design.

Not sure what happened, but I got this error message.

reload after editor failed: apply merged resolutions: failed to align text segment

The reproduction steps are

1. git merge
2. ec
3. select a file
4. e
5. make a change to the file
6. quit my editor

Looks like ec crashed at that point. Of course it's dependent on the file contents, but I cannot share my repo here unfortunately.

[chojs23]

@nullromo Did you edit text outside conflict bodies?

[nullromo]

Probably. Is that not allowed?

I think I started with something like this

my file
thing one
>>> conflict start
thing one yeah!
===
thing one no!
<<< conflict end

and I saved the file like this

my file
thing one yeah!
>>> conflict start
thing one yeah!
===
thing one no!
<<< conflict end

I tried to just save it and then head back to ec to see what it looked like. Sorry that this example is not very thorough.

[chojs23]

@nullromo It has to be fine and this error is bug. Will be fixed in next release, thanks!

[chojs23]

@nullromo Supports non-conflict edit on v0.3.0.