How do senior developers usually handle complex merge conflicts when rebasing feature branches against a fast moving main branch in a large Git repository?