Re: `master` is now `main`

[Pankaj Jangid]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> For `nongnu.git` the new branch is a "fast-forward" of the old branch,
> so all it takes is:
>
>     git branch -set-upstream-to=origin/main
>     git merge

Worked. My ‘master’ is now tracking origin/main.

> For `elpa.git` OTOH the new branch doesn't share any history with the
> new one, so you'll need something like:
>
>     git checkout -b main origin/main

$ git checkout -b main origin/main
$ git pull
$ git checkout master
$ git pull
fatal: refusing to merge unrelated histories

> If you have local changes, you'll want to `git stash` before doing that
> and `git stash pop` afterwards and it will likely give you non-trivial
> conflicts to resolve.  Don't hesitate to ask if you need help resolving
> such conflicts.
>