4 ms·

I really learned to appreciate VC when growing to a team project. Know what's even scarier than SVN or Git merges? Trying to merge zip files...

• fragmede 8y ago
  That's pretty easy. All you have to do is extract the first zip, go into the directory, run `git init; git add -a; git commit -m first` then unzip the second one and run... Hey wait a second.
  • danieldk 8y ago
    diff -ruN dir1 dir2 Use your favorite merge tool for changed files (like in git). (Of course, proper VCS wins any day.)