3 ms·
What do you mean by "public branch"? Public to the team, or public to the whole world? To anyone other than you. If other people are involved, then think very
by e40 12y ago
What do you mean by "public branch"? Public to the team, or public to the whole world?
To anyone other than you. If other people are involved, then think very seriously whether or not rebase should be used. Almost in every case it should not be.
- barrkel 12y agoExactly my point. How do you reconcile the idea of rebase "should not be" used vs "a merge should only occur to merge a finalized branch in". I'm on your side. My objection was to the latter statement, not the former. The basis of my objection to the former was (in part) because of the problems with rebasing when a branch is distributed. The idea that the only merges that occur are merges of finalized branches seemed very naive to me.