I don't rebase. I just merge and resolve the conflicts. Nowadays, I just have an agent do that for me, and move on with my life.