Avoid Git Merge Conflicts During a Big Rebase

Dependencies and Git branches