Re: Flood of commits from July?

[Patrice Dumas]

On Sat, Oct 05, 2024 at 06:00:40PM +0100, Gavin Smith wrote:
> On Sat, Oct 05, 2024 at 02:52:55PM +0200, Patrice Dumas wrote:
> > On Sat, Oct 05, 2024 at 11:00:05AM +0100, Gavin Smith wrote:
> > > I'd also like to know how many more of these commits are coming.
> > 
> > I still have some conflict/rebasing/cherry picking anomalies that may
> > require one or two small commits.
> > 
> > After that, there are 4 commits that are still pending, corresponding to
> > an implementation of INFO_MATH_IMAGES in Info.  They could be left for
> > the next release if you prefer.
> 
> As there are already huge changes since 7.1 it would be better to leave
> them, if it does not cause too much trouble with rebasing.

Ok.  It should not cause too much trouble with rebasing unless we start
working on the same piece of code before the release.  In that case I
propose that I add the code before doing the changes in master.
I think that it should be the general rule, otherwise the divergence is
too much of a pain.  If I do something in private branches again later
on, I will also do differently, and try a branch per feature to be able
to add the code of the feature only if there are possible conflicts in
code added to master.

-- 
Pat