sussman at red-bean.com
Thu Dec 4 21:25:17 CST 2008
On Thu, Dec 4, 2008 at 6:15 PM, Stefan Sperling <stsp at elego.de> wrote:
> I'd like to add some tree-conflicts material to the book.
> I'm not really sure where the best place to put this would be.
> I'd consider tree conflicts an advanced topic, but it looks like
> the advanced sections are about features that are nice to use if
> you know about them, but can be ignored by the novice user
> (keyword subsitution, sparse directories, locking, etc.)
> Unfortunately users won't be able to decide when they run into
> tree conflicts. They'll probably just run into them, albeit not
> as frequently as into text conflicts.
> I am considering adding a simple introductory example tree
> conflict for 'update' to the section entitled "Resolve Conflicts
> (Merging Others' Changes)". I'd also like to introduce the basic
> concepts of tree conflicts in this section (what is it, why, how...)
Yes, that makes the most sense to me. That section already introduces
the example of a textual conflict. It should also show a really
likely/common example of a tree conflict too.
Then, perhaps in chapter 9 somewhere we can add more details on tree conflicts?
More information about the svnbook-dev