khaije1/emacsdotd — comment on commit 01ce3fe25481916a25dce79bcc8b48bf6b352e08
File:  line 0
By canton7:

Hi,

Github's refusing to allow me to message you, since apparently you haven't provided an email address.... So I hope you notice this comment.

Anyway, further to our discussion on #git yesterday about --no-ff merges failing with conflicts, I've had a little success...

If you merge using the "resolve" merge strategy:

git merge --no-ff -s resolve pu-use-unix-fhs

It appears to work fine, which suggests that the recursive merge strategy is the one getting very confused (which matches with your assumptions yesterday). Passing -Xtheirs to recursive doesn't help matters at all.
The octopus strategy also gets confused...

So anyway, we have a workaround.

If you can find the time, an email to the git mailing list with a minimal example which causes the same behaviour would be greatly appreciated.
If you don't have the time, I should be able to look at it in a few weeks (if I remember).

Thanks!
Antony