DEV Community

Discussion on: 4 Useful Solutions to Common Git Problems

Collapse
jessekphillips profile image
Jesse Phillips

If you only rebase, no modification to the commits, everyone can rebase to stay up-to-date. Merge conflicts still happen, but git will understand you already have other commits.

But yes, a shared feature branch should be treated as a shared branch.