main.md

The default repos of all the tskit-dev repos is changing from master to "main" at 1200UTC on 20200928. (Monday)

The following repos are affected:

• administrative
• containers
• .github
• kastore
• msprime
• msprime-1.0-paper
• pyslim
• tscompare
• tsconvert
• tsinfer
• tskit
• tskit-build-examples
• tsviz
• tszip
• tutorials

What you need to do

You can switch to main at any point before the 28th as we are maintaining it as a copy of master already, it is updated every 5min.

For each repo you need to fetch the new main branch:

    ❯ git fetch upstream
    remote: Enumerating objects: 1, done.
    remote: Counting objects: 100% (1/1), done.
    remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0
    Unpacking objects: 100% (1/1), 649 bytes | 649.00 KiB/s, done.
    From github.com:tskit-dev/tskit
     * [new branch]      main       -> upstream/main
       bc50b5a..d2b6730  master     -> upstream/master

(If you initially cloned from the tskit-dev fork then you may need to replace upstream with origin)

Then you can checkout the branch

    ❯ git checkout main
    Branch 'main' set up to track remote branch 'main' from 'upstream'.
    Switched to a new branch 'main'

From this point you can git rebase main or git pull upsteam main and basically use main wherever you used master.

Any issues, let us know!