News for hackers. Stuff that matters.

A comment on JetBrains: $270M revenue, 405K paying users, $0 raised. Parent comment

Re:JetBrains: $270M revenue, 405K paying users, $0 raised by acemarke on Monday December 16, 2019 @12:15AM (#21800957)
I suggest using SourceGear DiffMerge for resolving conflicts. Best 3-way merge conflict handling tool I've tried:

https://sourcegear.com/diffmerge/

[ Parent | on HN ]
Re:JetBrains: $270M revenue, 405K paying users, $0 raised by luladjiev on Monday December 16, 2019 @07:41AM (#21802590)
Another suggestion is Beyond Compare, the 3 way merge is a pro feature though:

https://www.scootersoftware.com/

[ Parent | on HN ]
Re:JetBrains: $270M revenue, 405K paying users, $0 raised by tenken on Monday December 16, 2019 @01:08AM (#21801110)
Better than Meld?
[ Parent | on HN ]