[schoen]

I remember enjoying https://meldmerge.org/ in the past for interactive visual file merging. It's apparently still being somewhat actively developed.

[axismundi]

I really like the rubberband connections. They are like mental glue.