Git Rebaseでconflictしたら rebase元 (or 自分のbranch) を優先してrebaseを実行する

コマンド

conflictしたら自分のbranchを取り込む

git rebase <rebase元> -s recursive -X ours

ours

This option forces conflicting hunks to be auto-resolved cleanly by favoring our version. Changes from the other tree that do not conflict with our side are reflected in the merge result. For a binary file, the entire contents are taken from our side.

conflictしたらrebase元を取り込む

git rebase <rebase元> -s recursive -X theirs

theirs

This is the opposite of ours; note that, unlike ours, there is no theirs merge strategy to confuse this merge option with.