[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: `master` is now `main`
From: |
Pankaj Jangid |
Subject: |
Re: `master` is now `main` |
Date: |
Sat, 19 Dec 2020 14:06:16 +0530 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) |
Teemu Likonen <tlikonen@iki.fi> 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".
$ git checkout master
$ git reset --hard origin/master
HEAD is now at f1727b0c61 New dummy branch to announce deletion
$ git pull
Already up to date.
$ ls
’BRANCH DELETED’ ’USE BRANCH ‘main‘ INSTEAD’
I don’t have any content in this repository. But just curious, where can
people get the old history; which branch?
Re: `master` is now `main`, John Wiegley, 2020/12/19