Example subtree merge

subtree-merge

git remote add -f couchforms git://github.com/dimagi/couchforms.git
git merge -s ours --no-commit couchforms/master

# --prefix lets you specify where to put the submodule code
# the thing after the colon in couchforms/master:couchforms
# lets you specify what part of the submodule code to merge in
git read-tree --prefix=corehq/ex-submodules/couchforms -u couchforms/master:couchforms

git commit -m "subtree merge couchforms into corehq/ex-submodules"

git submodule deinit -f submodules/couchforms-src
git rm -r submodules/couchforms-src
git commit -m 'remove couchforms submodule'