As an open source maintainer, I really like the git-send-mail workflow because I can easily review patches in neomutt and apply them with "git am".

But I’m totally lost when git am fails because there’s no way to see the conflict nor to resolve it. Git repository is in AM-pending state and I can’t do anything meaningful but "git am --abort".

There’s surely a way.

0

If you have a fediverse account, you can quote this note from your own instance. Search https://mamot.fr/users/ploum/statuses/115923590806307565 on your instance and quote it. (Note that quoting is not supported in Mastodon.)