4 ms·
My dream would be to have a three-way merge tool that worked like this at a semantic level. It feels like merges almost always have the information needed to au
by grogers 4y ago
My dream would be to have a three-way merge tool that worked like this at a semantic level. It feels like merges almost always have the information needed to automatically resolve, but our line-based tools are too simple to see it.
- werdnapk 4y agoI used to use Araxis Merge [1] years ago and found it worked very well. [1] https://www.araxis.com/merge/index.en https://www.araxis.com/merge/index.en
- swozey 4y agoGeez, I've been looking at diff programs and the personal licenses for them are so expensive. I get they're incredibly useful when you need them but I personally don't need a 3rd party differ very often. Kaleidoscope is $250ish IIRC. The VSCode extension "Diff & Merge" give you the right/left arrows to merge lines if anyone is looking for a tool that does that. I haven't needed another one since I found that.
- activitypea 4y agoSublime Merge was pretty alright, don't know if it's still around
- nammi 4y agoIt's still around and getting periodic updates. I originally bought it mainly to give Sublime more money (after using the Sublime Text trial for most of college), but it ended up being useful and I use it daily https://www.sublimemerge.com/download https://www.sublimemerge.com/download
- jereees 4y agoThis is now supported without extensions in latest vscode
- ruricolist 4y agoResolve is another tree-sitter based tool that does this: https://github.com/grammatech/resolve https://github.com/grammatech/resolve
- newaccount2021 4y ago