git reset --hard git push -f origin master
Need to merge just file f of branch B into file f of branch A (assumes that all changes are committed in both branches A and B):
git checkout A git checkout --patch B f
see http://stackoverflow.com/a/11593308/295025
Add the following code to your website.
For more information on customizing the embed code, read Embedding Snippets.