`rebase` with fixing conflicts by always using a branch
git rebase -X ours -i origin/development
on merge conflicts, use origin/development
git rebase -X theirs -i origin/development
on merge conflicts, use my branch