stable vs. master branches

2022-02-22 Thread Aaron Schrab
Just now after updating my build (based on master) after the release of 2.2.1, I decided to look at the commits that aren't included in the stable branch. Other than the merges of stable back into master I see only one commit: 955d281f6 (Add missing period in a comment., 2021-04-08) Doing a

Re: stable vs. master branches

2022-02-22 Thread Kevin J. McCarthy
On Tue, Feb 22, 2022 at 07:07:42PM -0500, Aaron Schrab wrote: Just now after updating my build (based on master) after the release of 2.2.1, I decided to look at the commits that aren't included in the stable branch. Other than the merges of stable back into master I see only one commit: 955

Re: stable vs. master branches

2022-02-22 Thread Kevin J. McCarthy
On Tue, Feb 22, 2022 at 04:27:25PM -0800, Kevin J. McCarthy wrote: On Tue, Feb 22, 2022 at 07:07:42PM -0500, Aaron Schrab wrote: 955d281f6 (Add missing period in a comment., 2021-04-08) [...] That was a merge request from someone on gitlab. It fixes a typo in a code comment, so (IMO) doesn't

Moving towards an eventual 2.3.0

2022-02-22 Thread Kevin J. McCarthy
As you've probably noticed, I've started making 2.2.x releases off the stable branch. There is also already a commit for 2.2.2, but that release will probably not be until some time in March. My intention going forward is to not commit anything to master except for bug fixes merged from stabl

Re: stable vs. master branches

2022-02-22 Thread Aaron Schrab
At 18:17 -0800 22 Feb 2022, "Kevin J. McCarthy" wrote: On Tue, Feb 22, 2022 at 04:27:25PM -0800, Kevin J. McCarthy wrote: On Tue, Feb 22, 2022 at 07:07:42PM -0500, Aaron Schrab wrote: 955d281f6 (Add missing period in a comment., 2021-04-08) [...] That was a merge request from someone on gitl