0
Question
Should I rebase a feature branch after three teammates have pulled it?
We have a long-lived feature branch with commits from three people. Main has moved forward and the branch now has conflicts. I normally rebase my private branches, but force-pushing this one seems risky.
Is merging main into the feature branch the safer option here, or is there a clean team rebase workflow?