logoalt Hacker News

FanaHOVAyesterday at 8:59 PM1 replyview on HN

Solving merge conflicts on text-based files is infinitely easier than binary-based. It's not a useful comparison.


Replies

PaulDavisThe1styesterday at 10:26 PM

What does that have to with your VCS being integrated with your IDE? Isn't resolving merge conflicts in binary files going to entirely a function of the IDE and not the VCS ? What am I missing?