The 8.3.x branch is currently pointing at tag 8.3.9. It should be at 8.3.11. It looks like development is being done on the 8.x-3.x branch even though the tags have moved to semantic versioning. There also isn't a release node for the 8.3.x branch.

CommentFileSizeAuthor
#7 PR edit to change base branch.png743.42 KBjonathan1055

Comments

Liam Morland created an issue. See original summary.

klausi’s picture

klausi
he/him||they/them
Primary language German
Location 🇦🇹 Vienna
commented
Assigned: Unassigned » pfrenssen

Right, we never finished the transition to this branch. I updated the branch 8.3.x and set it to default on drupal.org.

Now we also need to set it as default branch on Github, but I think on pfrenssen can do that right now. Pinged him on slack, will also assign to him here.

pfrenssen’s picture

pfrenssen
Location Sofia
commented
Status: Active » Fixed

Good point! I set 8.3.x as default on the github repository.

klausi’s picture

klausi
he/him||they/them
Primary language German
Location 🇦🇹 Vienna
commented

Thanks!

jonathan1055’s picture

jonathan1055 commented

Nice work @pfrenssen and @klausi.

One question - there are 5 PRs on https://github.com/pfrenssen/coder/pulls that were created when the default was 8.x-3.x so they are still trying to merge into that branch. Two of them are mine PR 129 Incorrect counting of array elements by comma and PR 130 Improve fixer in ShortFullStop sniff. @klausi's three latest commits for github actions are not on the https://github.com/pfrenssen/coder/tree/8.x-3.x branch so my PRs include them in the commit list.

Is there a way that we can fix those five PRs so that they now merge into 8.3.x not 8.x-3.x? Or do we just discard them and start again. It would be nice to keep the PR work done so far, with comments, history, etc and just change the base branch.

Or can you ignore the duplicate commits when merging in to 8.3.x? It will only be for these five PRs as all new ones should be created against 8.3.x

jonathan1055’s picture

jonathan1055 commented

Solved. I found that I can edit the PR myself and change the base branch from 8.x-3.x to 8.3.x

jonathan1055’s picture

jonathan1055 commented
StatusFileSize
new PR edit to change base branch.png743.42 KB

For reference, and to help anyone else, here are some screen shots
PR edit to change base branch

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.