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 cwojno on Sunday December 15, 2019 @06:12PM (#21799637)
Try doing a merge with IntelliJ's 3-way merge UI. It's flippin' fantastic compared to roaming through the files and removing sections between >>>> and <<<<.
[ Parent | on HN ]
Re:JetBrains: $270M revenue, 405K paying users, $0 raised by philwelch on Sunday December 15, 2019 @07:17PM (#21799907)
Command-line git allows you to specify a mergetool, many of which are capable of three way merges.
[ Parent | on HN ]
Re:JetBrains: $270M revenue, 405K paying users, $0 raised by cwojno on Monday December 16, 2019 @02:24AM (#21801337)
The point was convenience. I don't have to leave the IDE.
[ Parent | on HN ]
Re:JetBrains: $270M revenue, 405K paying users, $0 raised by chiefsucker on Monday December 16, 2019 @01:45PM (#21805773)
For some people Unix is the IDE.
[ Parent | on HN ]