Resolve incoming conflicts with SVN automatically
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 local sandbox from the SVN repository and it happens that I get merge conflicts for some reasons. Mainly this happens for XML files that are re-ordered internally although having the same content in fact.
Therefore I regularly face the problem that I could simply solve the conflicts by accepting all incoming versions or by staying with mine.
This one-liner helps here
1
svn status |grep '^C' | awk ' { print \$2 } ' | xargs -n1 svn resolve --accept=theirs-full