27 ms·
What do you mean by "public branch"? Public to the team, or public to the whole world? I do commercial closed-source development; there is no public branch to
by barrkel 12y ago
What do you mean by "public branch"? Public to the team, or public to the whole world?
I do commercial closed-source development; there is no public branch to the whole world. OTOH, all feature branches are public to the team; only trivial features involve a single developer. So your assertion doesn't seem well-formed to me.
Further: The distribution of code and feature responsibilities in a team of full-stack engineers is fluid. Depending on the day, any person might be working on a feature, and the person previously working on it might not even be in the office. It's a general policy where I work to push your branches before close of business.
- e40 12y agoWhat 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.
- bnegreve 12y ago> I do commercial closed-source development; there is no public branch to the whole world. OTOH, all feature branches are public to the team If you don't work with private branches, it's not surprising that you don't see any value in rebasing which is mostly useful for private branches. In fact, if you don't have private vs. public scenarios, it's not really clear whether you need a distributed version control system. But that makes sense, DCVS were developed for OSS after all.
- nawitus 12y agoWhat does "private branch" mean? All branches are "private" until I publish them. If I create a branch which tracks a remote branch and make a commit to it, my local branch is "private" and the commit is "private. However, I can push that "private branch" to other developers, and then it becomes public.
- guipsp 12y ago>What does "private branch" mean? All branches are "private" until I publish them. Exactly that. An unpublished branch.
- barrkel 12y ago> it's not really clear whether you need a distributed version control system The benefits of a DVCS are far broader than that. Development on code that is stored on individual developer's machines is fundamentally distributed. Removing the requirement to be connected for any interaction with the system is major. Deferring conflicts until merge time rather than using file locking is major. There are loads of benefits from DVCS that have no requirement for an important distinction between public and private.
- ulisesrmzroche 12y agoBy public branch he means something like "master", a branch where we (developers) are using, public to the team. this is not about open-sourcing your code. Feature branches are throw-away, this is a big part of the zen of Git.
- marrs 12y agoI do commercial closed-source development; there is no public branch to the whole world. OTOH, all feature branches are public to the team; only trivial features involve a single developer. So your assertion doesn't seem well-formed to me. Actually you can still rebase, but you would benefit from having a separate shared repository for developing that feature, so that you can share rebases without rewriting history on the release remote. This makes it easier to manage public rebases, because you only affect those devs working on the feature, but more importantly it means that you still get the security because your release repository always maintains the integrity of its history.