git svn

"Cherry pick" all changes required to make same as another branch:

git merge --squash -X theirs <other_branch>

Makes no commit, but stages all changes