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

Resolving conflicts during merge - could not postpone all

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 18 Feb 2013 11:50:51 -0500

I just did a merge using current trunk. There were a lot of text and
tree conflicts. I noticed it does not start resolving them until the
end now, which is expected. However, one thing I could not do was
postpone all conflicts. I used the 's' option and saw that option 'q'
is supposed to do this but I still had to enter 'p' or 'q' for every
conflict.

I assume this is a bug?

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
Received on 2013-02-18 17:51:26 CET

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

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