Contrib.social

Git branches are confusing

Open on Drupal.org →
Created on 16 October 2023, 9 months ago
Updated 2 November 2023, 8 months ago

Problem/Motivation

In this project there are many git branches, and the naming schemes diverge from what is normally used. This is confusing for contributors, especially because the branches are not described in the project page or the README.

Current situation

There are 5 open development branches:

  1. 3.0.x: Seems to have some Drupal 10 work done independently from 📌 Automated Drupal 10 compatibility fixes Fixed .
  2. 8.x-1.x: Seems to be obsolete, last commit is from 2018. Should probably be deleted.
  3. 8.x-1.x-dev: Another 2018 branch which shares 1 commit with 8.x-1.x and then diverged from it. Also obsolete. Should probably be deleted to avoid confusion.
  4. 8.x-2.x-dev: This is the default branch which is announced on the front page. No Drupal 10 support.
  5. 8.x-2.x: This seems to be the best branch? It has the latest code and contains the official Drupal 10 support from 📌 Automated Drupal 10 compatibility fixes Fixed .

Proposed resolution

Make 8.x-2.x the default branch. Delete all other branches.

📌 Task
Status

RTBC

Version

3.0

Component

Code

Created by

🇧🇬Bulgaria pfrenssen Sofia

Live updates comments and jobs are added and updated live.
Sign in to follow issues

Comments & Activities

  • Issue created by @pfrenssen
  • Comment 8 months ago →
    🇫🇷France pbonnefoi

    I think the 3.0.x needs to stay as it is the new version standard (And I've done some work to update the code to the latest standards). A release in 3.0.0 would be nice and let the branch 8.x be only the one working on Drupal 8 and 9.

  • Status changed to RTBC 8 months ago
  • Comment 8 months ago →
    🇦🇺Australia VladimirAus Brisbane, Australia

    I'm cleaning up branches now, cutting 3.0.0 release and making 3.0.x main branch

contrib.social Blog FAQ Discussions
Production build 0.69.0 2024