one-liner

Resolve incoming conflicts with SVN automatically

less than 1 minute read

OK, you might expect that I have the killer tool that really solves merge conflicts automatically, but this one-liner is much simpler. I sometimes update my...