Re: `master` is now `main`

[Teemu Likonen]

* 2020-12-19 12:47:27+0530, Pankaj Jangid wrote:

> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>> 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

Your local "master" is now different from the upstream (origin)
"master". They don't have related history anymore as the error message
says. If your local "master" does not have any of your important commits
you can reset it and its working tree with "git reset --hard":

    git checkout master
    git reset --hard origin/master      # Provided that your upstream is
                                          called "origin".

-- 
/// Teemu Likonen - .-.. https://www.iki.fi/tlikonen/
// OpenPGP: 4E1055DC84E9DFF613D78557719D69D324539450

signature.asc
Description: PGP signature