[SvnBook] #113: More conflict resolution options
SvnBook
noreply at red-bean.com
Tue May 6 00:21:14 CDT 2008
#113: More conflict resolution options
----------------------+-----------------------------------------------------
Reporter: cmpilato | Owner: fitz
Type: defect | Status: new
Priority: normal | Milestone: 1.5
Component: content | Version: nightly/trunk
Keywords: |
----------------------+-----------------------------------------------------
Chapter 2's bit about conflict resolution fails to mention the new 'svn
resolve' subcommand and its --accept goodies. In fact, --accept shows up
nowhere in the book except the reference in chapter 9, which means we've
apparently no examples of using 'svn update' or 'svn merge' with forced
acceptance of one of the automatic conflict resolution options.
--
Ticket URL: <http://svnbook.red-bean.com/trac/ticket/113>
SvnBook <http://svnbook.red-bean.com/>
More information about the svnbook-dev
mailing list