On 2021-05-05 10:07 a.m., Cecylia Bocovich wrote:
Hey everyone,
We're in the process of switching to using `main` as the default branch in our repositories. I've created a ticket to document and manage this switch:
https://gitlab.torproject.org/tpo/anti-censorship/team/-/issues/6
Hi,
This migration from `master` to `main` is done for the anti-censorship team repositories that we maintain. You can see a full list in the ticket above. When you clone one of the anti-censorship team repositories from GitLab or git@git-rw.torproject.org, the main branch should be checked out by default. For any contributors who have checked out one of these repositories, you'll need to run the following commands to update your local copy:
``` $ git checkout master $ git branch -m master main $ git fetch [remote] $ git branch -u origin/main main $ git remote set-head [remote] -a ```
If you've checked your code out using HTTPS from https://git.torproject.org, the changes are slow in taking affect so the last `remote set-head` step might not be updated yet.
If you had open merge requests these have been updated to target the main branch.
Please let us know if you have any difficulty with the switch!
Cecylia