OOPS, forgot the very last step. Once you've verified that the git merge
worked the way you want, do a "git branch -d branch-with-files". You might
want to do a "git gc" as well just to recompress everything. But it's not
absolutely necessary. I'm just a bit minus on space.
On Sunday, December
Do you mean that you have a "distribution repository" (without a working
directory) and you want to add to it what is in a non-master branch in
another git-managed directory (i.e. it has a "working directory" with the
files). Have you looked to see if submodules or subtrees will do what you
wan
