Hacker News new | ask | show | jobs
by bibabaloo 2254 days ago
Without have the ability to merge two files that have started from the version and then diverged, git loses a lot of its usefulness, IMO. Unfortunately it's not trivial to merge the type of files that other professions use (eg: images for marketers or drawings for architects or even standard .doc word files). Not to say that conceptually it shouldn't be possible to merge the files, but the tech isn't there.