Re: stable/2.26 has branched; master is 2.27.0
Jonas Hahnfeld via Discussions on LilyPond development <[email protected]> Tue, 17 Mar 2026 22:00:56 +0100
| Newsgroups | gmane.comp.gnu.lilypond.devel |
|---|---|
| Message-ID | <[email protected]> |
On Sun, 2026-03-15 at 09:33 +0100, Jean-Charles Malahieude wrote: > Le 12/03/2026 à 22:31, Jonas Hahnfeld a écrit : > > Translation updates can continue to go into the stable/2.26 branch, all > > other fixes should be reviewed and land in master first. As the last > > times, I will label with ~Backport those merge requests that I intend > > to cherry-pick into the branch. > > What I did yesterday is: > make a new folder in order not to be disturbed > git init-db > > git remote add -ft stable/2.26 -m stable/2.26 origin > [email protected]:lilypond/lilypond.git > > git checkout -b stable/2.26 origin/stable/2.26 > > create my work-branch, update files and commit these changes > > git push -u origin dev/jcm/FR-260314 > > log-in to Gitlab and create an MR towards stable/2.26 > > but it remains blocked after 14 hours with "Checking pipeline status" an > later below "Merge blocked: 1 check failed" and "Pipeline must succeed". > How should I process? just click the "Run pipeline" button on the > Pipelines tab? The reason is that the merge request pipelines are not set up for stable branches. I can look into fixing this... or you can push to stable/2.26 directly, after making sure locally that everything builds fine, as we did the last times. > BTW I also updated Changes, which I'll purge once it has landed in master. Ok, I'll probably have to deal with the conflicts when forward-porting to master after the release candidates. Jonas
signature.asc
(application/pgp-signature, 228 B)
-----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQRiF4DLRvon1vw5biCcVOmY/6OEDwUCabnBCAAKCRCcVOmY/6OE D1QIAP4u1xy2lDg1hA108Mnf2SOSe19PmxUsjskCf4HHExz2AAD9FmD+DFtmmiLm wQRWFzwutRGrymuastH4qLtCTTK3vwA= =nfdC -----END PGP SIGNATURE-----