For an overview of merging folders, see the following topics:
About Resolving Conflicts
Move and Rename Detection
About Upload Rules
Merging Folders