Difference between revisions of "Developer Area/Switching Git from 'master' to 'main' for the default branch"

From Mahara Wiki

< Developer Area
Line 24: Line 24:
==Update the Gerrit hook==
==Update the Gerrit hook==
#. Open the file 'post-checkout' in '.git/hooks'.
# Open the file 'post-checkout' in '.git/hooks'.
#. Find 'master' and change it to 'main'.
# Find 'master' and change it to 'main'.
#. Save the file.
# Save the file.

Revision as of 15:03, 14 October 2021

On 14 October 2021 we switched the main Git branch from 'master' to 'main'. Those that already have a local Mahara instance running for development purposes need to make a few changes so as to push code correctly to Gerrit.

Change your local setup to point to the new branch

The following instructions are taken from 'How to change your master branch to main in Git

# Switch to the "master" branch:
$ git checkout master

# Rename it to "main":
$ git branch -m master main

# Get the latest commits (and branches!) from the remote:
$ git fetch

# Remove the existing tracking connection with "origin/master":
$ git branch --unset-upstream

# Create a new tracking connection with the new "origin/main" branch:
$ git branch -u origin/main

Update the Gerrit hook

  1. Open the file 'post-checkout' in '.git/hooks'.
  2. Find 'master' and change it to 'main'.
  3. Save the file.