Feature: `git folder combine`

[claybridges]

Combine branches of source folder into target folder, deleting the source folder if successful.

git folder combine [--strategy [unique|prefer-target|prefer-combine]] <targetFolder> <sourceFolder>

Branches in sourceFolder will be combined into (/moved to) targetFolder. Conflicts are managed according to --strategy:

• unique: fail unless branches in combined set are unique
• prefer-target: Use the targetFolder branch in a conflict
• prefer-combine: Use the combineFolder branch in a conflict

Default strategy is unique.