[Feature Request] Ignore Whitespace Difference in Merge Tool

[decadence]

P4Merge has nice feature where you can ignore whitespace changes so they don't consider as conflicts. Would be great to have this in Fork merge tool.

In this case in final file goes any version of text chunk.

[DanPristupov]

Well, it doesn't sound like a good feature for me. Formatting is part of the file (tabs vs spaces, offsets, etc) and it must be maintained.

P4Merge has nice feature where you can ignore whitespace changes so they don't consider as conflicts.

And, how is the conflict resolved in the end?

[decadence]

Formatting is part of the file (tabs vs spaces, offsets, etc) and it must be maintained.

That's why it should be optional 🙂 But this will allow you not to resolve unnecessary conflicts that are not really conflict.

And, how is the conflict resolved in the end?

P4Merge takes your version of the chunk but you can make it selectable in your realization.

Anyway this is just a suggestion, so you can close the ticket if you don't like it 🙂 I found it's useful when I use P4Merge.

[jamesford42]

I have used Beyond Compare for my diff and merge tool for a very long time, and sometimes do make use of the same equivalent setting in it. Maybe check it out. It is configurable as the external dif and merge tool used by Fork.

Er, actually is P4Merge not configurable in the same way?

Edit: To clarify, have you tried setting up in your Fork preferences to use P4Merge as the external merge tool?

[decadence]

I have used Beyond Compare for my diff and merge tool for a very long time, and sometimes do make use of the same equivalent setting in it

Thanks. Will give this a try.

Edit: To clarify, have you tried setting up in your Fork preferences to use P4Merge as the external merge tool?

I have. Sometimes I use P4Merge, sometimes Fork merge tool itself. Just wanted to suggest this feature for Fork to make it better 🙂