Question

Possible Duplicate:
How to merge a branch into another with override option in git

I have some folders on a branch, I want them to just override the same folders on master.

I dont want to go through merge.. I just want a straight replace.

Any ideas how to do this in Git?
Thanks

Answer 1

This is really quite simple:

git checkout master
git checkout <branch> -- <directory>

The first command puts you on master. The second takes all the diffs between <branch> and master in <directory> and stages them for commit.

Now just issue git commit as you normally would.