Document tree conflicts

The official documentation of the Subversion version control system

Brought to you by: cmpilato, danielshahaf

#20 Document tree conflicts

Milestone: en-1.6

Status: Fixed

Owner: nobody

Labels: None

Priority: Medium

Type: Defect

Updated: 2010-05-02

Created: 2008-12-12

Creator: Anonymous

Private: No

Originally created by: cmpilato
Originally owned by: s...@elego.de

Subversion 1.6 will be delivering a bunch of tree-conflicts-related stuff.
Necesitamos documentación, por favor.

Discussion

Comment has been marked as spam.
Undo

View and moderate all "tickets Discussion" comments posted by this user

Mark all as spam, and block user from posting to "Tickets"

Anonymous - 2008-12-12

Originally posted by: cmpilato

I think stsp is planning to tackle this, God bless him.

*Originally posted by:* [cmpilato](http://code.google.com/u/cmpilato/) I think stsp is planning to tackle this, God bless him.

Add attachments
Cancel
You seem to have CSS turned off. Please don't fill out this field.

You seem to have CSS turned off. Please don't fill out this field.

New Attachment:

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Comment has been marked as spam.
Undo

View and moderate all "tickets Discussion" comments posted by this user

Mark all as spam, and block user from posting to "Tickets"

Anonymous - 2009-03-20

Originally posted by: cmpilato

Assigning to stsp.

Owner: s...@elego.de

*Originally posted by:* [cmpilato](http://code.google.com/u/cmpilato/) Assigning to stsp. **Owner:** s...@elego.de

Add attachments
Cancel
You seem to have CSS turned off. Please don't fill out this field.

You seem to have CSS turned off. Please don't fill out this field.

New Attachment:

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Comment has been marked as spam.
Undo

View and moderate all "tickets Discussion" comments posted by this user

Mark all as spam, and block user from posting to "Tickets"

Anonymous - 2010-05-02

Originally posted by: s...@elego.de

A section about tree conflicts was added to the book some time ago.
http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html

Status: Fixed

*Originally posted by:* [s...@elego.de](http://code.google.com/u/116606928182476732418/) A section about tree conflicts was added to the book some time ago. [http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html](http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html) **Status:** Fixed

Add attachments
Cancel
You seem to have CSS turned off. Please don't fill out this field.

You seem to have CSS turned off. Please don't fill out this field.

New Attachment:

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Log in to post a comment.