Version Control With Subversion Source

The official documentation of the Subversion version control system

Brought to you by: cmpilato, danielshahaf

Commit [r4172] Maximize Restore History

* en/book/ch04-branching-and-merging.xml

(svn.branchmerge.advanced.mergeconflicts): Replace examples
demonstrating merges of the wrong diff, in 1.7 we get tree
conflicts, not skips. Update explanatory text as appropriate.

Authored by: ptburba@gmail.com 2011-11-08

Browse code at this revision

Parent: [r4171]

Child: [r4173]

changed

/trunk/en/book/ch04-branching-and-merging.xml

Version Control With Subversion Source

The official documentation of the Subversion version control system

Commit [r4172] Maximize Restore History

/trunk/en/book/ch04-branching-and-merging.xml Diff Switch to side-by-side view