[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Cherry-picking merges

From: Vadym Chepkov <vchepkov_at_gmail.com>
Date: Thu, 29 Apr 2010 13:34:26 -0400

> [b2]$ svn merge --dry-run ^/branches/b1
> --- Merging r2 through r4 into '.':
> C README
> Summary of conflicts:
> Tree conflicts: 1

and yet another strange thing about it.
There is no way to automatically resolve a conflict like this.
no matter what flag I use --accept mine-conflict, mine-full, nothing seems to make merge operation happy.
I have to issue a separate svn resolve --accept working command afterwards.

Vadym
Received on 2010-04-29 19:35:01 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.