Make git choose remote changes instead of local changes in merge

Question

I usually do rebases on my local branch to organize commits before pushing. Whenever I do a rebase and change something on a previous commit, I possibly get conflicts on the