Rebase and Always Take the Upstream Version

git rebase main
git checkout --theirs {path}
git add .
git rebase --continue