Comment Comment by FanaHOVA Solving merge conflicts on text-based files is infinitely easier than binary-based. It's not a useful comparison. parent FanaHOVA 4 months ago