This is a small collection of git tips and questions/answers you may find useful.

• A few ideas about how to handle conflicts, during merges, or cherry-picks.

• http://weblog.masukomi.org/2008/07/12/handling-and-avoiding-conflicts-in-git

• http://stackoverflow.com/questions/161813/how-do-i-fix-merge-conflicts-in-git

• Apply a commit from a different repository (with no common commits) *

git --git-dir=../some_other_repo/.git format-patch -k -1 --stdout <commit SHA>| git am -3 -k

• subtree-merge tip: how to import another repository in a subdirectory of your repo.
  • https://help.github.com/articles/working-with-subtree-merge