On Mon, Mar 03, 2025 at 01:13:46PM +0100, Pavel Sanda wrote: > On Mon, Mar 03, 2025 at 11:54:22AM +0100, Scott Kostyshak wrote: > > True. What if I volunteer to take care of the pruning to keep things > > clean? > > Might work. > > > I'm not sure about this. I don't think the merge commit takes up much > > additional space. I'm pretty sure Git is efficient and does not > > duplicate the commits in the feature/bug branch and the master > > repository. > > Unless someone starts messing with po/ stuff you are probably right. > > > The current workflow of pushing things and cleaning things up in later > > commits feels messy, makes git bisecting a pain, and makes it harder to > > test current master (e.g., if I happen to check things out in the middle > > of a string of changes.). And sometimes there are known regressions in > > master that hang around longer than I feel they should. > > I agree that master flow is little messy, but I believe large part of > the mess is discovered only because of others work with master. > If you split to unique branch you are almost certain to be lonely > given our numbers.
Good point. I do think you're right that the dev would need to explicitly ask. For example, people can say "I pushed my patches to branch xyz. Can someone test if this compiles for them?" Or "Can someone (i.e., me or Kornel) run the ctests?". I think in these cases there will be responses and testing. If by chance there is not, they should feel free to merge. > We have features repo https://git.lyx.org/gitweb/?p=features.git;a=summary > where longer-term projects can go in unique branch. Is it so much more > difficult to merge from there if you prefer to work with unique > branches? In practice, I don't think it's so much more difficult once it's set up, although I'm not sure how many people feel comfortable dealing with multiple remotes with git. > We actually have even personal repos but they were so unused that > I hid them from the web view... True, my theory is that some developers don't use branches because having to use the features repo is just a bit more of an inconvenience than using the main repo. I'm not so confident in my theory though. Scott
signature.asc
Description: PGP signature
-- lyx-devel mailing list lyx-devel@lists.lyx.org https://lists.lyx.org/mailman/listinfo/lyx-devel
