On Sun, Mar 02, 2025 at 09:40:00PM +0100, Pavel Sanda wrote: > On Sun, Mar 02, 2025 at 05:16:23PM +0100, Scott Kostyshak wrote: > > Is it OK to push branches to our main repository? > > > > We have a features repository (https://wiki.lyx.org/Devel/LyXGit#toc4), > > but I'm talking about more short-lived branches. It would be more > > convenient if we can make those on the main remote, but I forget if we > > have a policy against that for some reason. > > I would prefer not to do it. It will clutter list of branches which we > currently > reserve for major stuff like "2.4.x" (eg imagine listing in our git web > services)
True. What if I volunteer to take care of the pruning to keep things clean? > and probably also unnecessarily increase size of the whole repo which is > slowly > approaching 1GB already (not trying to save disk space but rather download > bandwidth). 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. To me, the main disadvantage is the process of creating a branch, and then subsequently doing the merge back into main (although I would volunteer to do this if it would make a difference). 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. These problems would be lessened if we encourage a branch workflow. By the way, my partner is shocked how organized I am in my digital life and the contrast to how disorganized I am in my physical life :). All that said, I feel that there is not much support for my proposal (e.g., no +1), so indeed we should not change things unless others think it is worthwhile. Scott
signature.asc
Description: PGP signature
-- lyx-devel mailing list lyx-devel@lists.lyx.org https://lists.lyx.org/mailman/listinfo/lyx-devel
