Add notes about resolving tree conflict use cases 1 to 6.
Add notes about resolving tree conflict use cases 1 to 6.

This file does not describe any design requirements.
It just shows how one may go about resolving particular
tree conflicts using what we currently have in trunk.

Maybe it will provide inspiration, or come in handy as
a reference, for someone, somewhere, some day.

* notes/tree-conflicts/use-cases-resolution.txt: New file.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@874362 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion