Git Rebase Theirs

theirs in this case means the branch you are on, so if you are on branch feature, that's the theirs in reference here.

  git rebase -s recursive -X theirs dev