subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dag-Erling Smørgrav <...@des.no>
Subject Re: Tree conflict resolution considered harmful
Date Thu, 30 Aug 2018 21:49:57 GMT
Daniel Shahaf <d.s@daniel.shahaf.name> writes:
> Dag-Erling Smørgrav <des@des.no> writes:
> > % svn resolved $(svn stat | awk '$2 == "C" { print $3 }')
> 'svn resolved -R ./' is equivalent and more robust.

No.  My command line only resolves tree conflicts.  Yours also resolves
text conflicts.

DES
-- 
Dag-Erling Smørgrav - des@des.no

Mime
View raw message