3 ms·
How do you collaborate on a branch using this workflow? The constant rebasing means you can't have multiple devs pushing to the same branch.
by ricardobeat 9y ago
How do you collaborate on a branch using this workflow? The constant rebasing means you can't have multiple devs pushing to the same branch.
- saltedmd5 9y agoThe ironic thing about this is that the link they post as a justification for rebasing feature branches onto develop is actually a very explicit reason _not_ to be rebasing in this situation. The section reads like the author thinks that the problem with rebasing public branches is merge conflicts (it isn't; it's rewritten/diverging histories) and that interactively rebasing somehow resolves this problem (it doesn't). This smacks of something that I come across all the time: strong opinions on how to use Git held by people who don't actually understand Git.
- rockostrich 9y agoCreate a feature branch. All collaborators branch off the feature branch and PR into the feature branch. When the feature branch is ready, make a PR into develop. The problem with this workflow is that it prevents rebasing unless someone rebases the feature branch manually. You would have to make a merge commit to follow this workflow safely.