If the changes are small enough I just do rebase -Xtheirs main, and look to see if anything looks fucky (git diff main..).