Problem/Motivation

I created a 1.0.x branch (I think I created it) as we need a semver branch in order to properly tag isues and tag releases. However the default branch is main. Currently main and 1.0.x are in sync. As far as I can tell releases are tagged from main and not 1.0.x but I might be wrong about this. I think it would be much easier if we had a single branch for dev until such time as we need to do a 2.x etc.

Typically I'd use 1.x which would allow any patch and minor releases to be tagged off of that branch but I know that a lot of Drupal modules have a dev trunk for each minor (like we have now 1.0.x).

As a developer on this module (not a maintainer) I am unable to make alterations to branches in GitLab (such as set which one is default and/or delete branches).

So I thought I'd make an issue to get opinions on how we should proceed. Having both main and 1.0.x is awkward and confusing and ideally we'd ensure the two are in sync and then set 1.0.x as the default and delete main (in my opinion). This would then mean that all drupal.org issues would automatically be branched from the 1.0.x trunk and make it much easier to merge and tag releases.

I suppose what I'm looking for is what would be preferable for everyone else and if the original maintainers can make the changes in GitLab to streamline future development on this module.

Many thanks and if anything doesn't make sense please tell me!

Comments

d.fisher created an issue. See original summary.

d.fisher’s picture

Assigned: Unassigned » yustintr
d.fisher’s picture

@yustintr can you perhaps change my role to maintainer so I can resolve this one myself?

yustintr’s picture

Status: Active » Fixed

Done

Now that this issue is closed, review the contribution record.

As a contributor, attribute any organization that helped you, or if you volunteered your own time.

Maintainers, credit people who helped resolve this issue.

d.fisher’s picture

Thank you. I've just synced the main and 1.0.x branches. Are you ok if we drop the 'main' branch altogether and tag from the 1.0.x branch instead?

yustintr’s picture

Thats oke for me

d.fisher’s picture

Status: Fixed » Closed (fixed)

All done!! Nice to get this one cleaned up. Thank you.

d.fisher’s picture

Assigned: yustintr » Unassigned