How do I make Git always use “theirs/ours” for resolving conflicts in a particular file, during rebase?

来源：https://stackoverflow.com/questions/31560274/how-do-i-make-git-always-use-theirs-ours-for-resolving-conflicts-in-a-particul