--ignore-space-change flag for all situations about jfstmerge HOT 3 CLOSED

When merging the triple:

There is no difference besides the blank lines. I was expecting that the flag --ignore-space-change would work for that, but it does not, and there is still a merge conflict:

So I suspected the flag was not working, or even not reaching all merging situation. However, when merging the same triple directly via git, invoking git's own flag, the result was the same:

The git manual says that "[...]the option ignores whitespace completely when comparing lines[...]"
I believe that they strictly consider whitespace, not including blank lines as in the example.

So, in principle, we have two options:

1. Assume that this is correct, and leave as it is.
2. Build upon that and include blank lines.

What do you think @pauloborba @jvcoutinho ?

from jfstmerge.

excellent point @guilhermejccavalcanti!

I believe that we should keep the git behavior, and explicitly explain that in the text that explains the flag --ignore-space-change

But have you tried the git option -Xignore-space-change too? I believe this should be the option we should use (look for ignore-space-change here https://git-scm.com/docs/git-diff) for comparison purposes.

Deleting a line doesn't seem to be considered a space change.

from jfstmerge.

But have you tried the git option -Xignore-space-change too? I believe this should be the option we should use (look for ignore-space-change here https://git-scm.com/docs/git-diff) for comparison purposes.

Same merge conflict with that option.

from jfstmerge.