Rebase is something that I see a lot of developers shy away from but it is usually the right way to get a feature branch re-aligned. My practice is to rebase a

Rebase is something that I see a lot of developers shy away from but it is usually the right way to get a feature branch re-aligned. My practice is to rebase all my pending PRs each morning to make sure that the prior day's activity is coalesced. If you wait weeks and weeks to do the first rebase for a big change set, you can wind up visiting the same files and conflicts way more times than is logical. In my experience, this results in a much greater chance of screwing something up along the way, further reinforcing for some developers that the rebase is bad. Timely rebase is the answer.