trunk
Don't interrupt the update/switch/checkout with an error on incoming dir add vs. local unversioned. Instead, flag a conflict (so far a tree conflict) and pull in all the other unrelated nodes.
Apply ASF license headers to a number of files included under that license but lacking said header.
Update issue tracker links in notes, from Tigris (issuezilla) to Apache (Jira).
Tree conflicts documentation update.
* notes/tree-conflicts/resolution.txt Add notes on how scheduled renames and replacements are treated.
Fix typos.
Add notes about resolving tree conflict use cases 1 to 6.