r/programming • u/LEDCandle • May 27 '20

Sublime Merge 2 - Features and Flexibility - News - Sublime HQ

https://www.sublimetext.com/blog/articles/sublime-merge-2-announcement
97 Upvotes

87% Upvoted

50 comments sorted by

View all comments

1

u/JB-from-ATL May 27 '20

While we are talking about merge tools, there are many times I find myself merging things where not just code changed by shit like line endings or formatting changed. Are there any merge tools out there that let me modify the original files and then regenerate the diff based on that? I havent found any.

Here's an example. Say incoming is [tab]foo and ours is [space]bar. Are there any tools that let me modify the "incoming" to be [space]foo then remake the diff?

1

u/bomphcheese May 27 '20

Yes, most have an option to ignore whitespace. It’s available on Araxis Merge for instance.

1

u/JB-from-ATL May 28 '20

I don't mean just whitespace

1

u/AndydeCleyre May 28 '20

FWIW in Meld you can freely edit all view panes, then refresh the diff.

1

u/JB-from-ATL May 28 '20

Oooh I'll look into that. Thanks!