This is a compilation of the commands that I can never remember of the top of my head and dont want to google to find the right article for.

Default rebase conflicts to theirs

git rebase -X theirs <branch_to_rebase_onto>

Set or reassign git remote tracking branch

git branch current_branch --set-upstream-to origin/<remote_branch_name>```