From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Pankaj Jangid Newsgroups: gmane.emacs.devel Subject: Re: `master` is now `main` Date: Sat, 19 Dec 2020 12:47:27 +0530 Organization: Code Is Great Foundation Message-ID: <87r1nmcliw.fsf@codeisgreat.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39302"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Dec 19 08:18:20 2020 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kqWVP-000A8a-Te for ged-emacs-devel@m.gmane-mx.org; Sat, 19 Dec 2020 08:18:19 +0100 Original-Received: from localhost ([::1]:46762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqWVO-0000FA-Tt for ged-emacs-devel@m.gmane-mx.org; Sat, 19 Dec 2020 02:18:18 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqWUf-0008FC-Gb for emacs-devel@gnu.org; Sat, 19 Dec 2020 02:17:33 -0500 Original-Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]:40846) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kqWUe-0005pp-2Y for emacs-devel@gnu.org; Sat, 19 Dec 2020 02:17:33 -0500 Original-Received: by mail-pj1-x1035.google.com with SMTP id m5so2648029pjv.5 for ; Fri, 18 Dec 2020 23:17:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeisgreat-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:organization:references:mail-followup-to:date :in-reply-to:message-id:user-agent:mime-version :content-transfer-encoding; bh=sdWu8D1SyEStzr8x4AbRpHfAtnEVjQe0OtG/f9YnGGY=; b=X7xgDSbiK9u01EVYzVt3TJYh77qOYdxZWGarbZCw3EQ/tRJ6cOxrAyHF+FrO8n6l1I d/qF6DY6uo46j7kyhtP+12mlNQ7ONQqJQtbGneKIfNjYE5vcZNp8TF8DYD0g2AULo7BC OMlMVr/ayK5bV/ZluK6TDO0RngbrJWIYVva5cwT/+G73ALlTIVfz/hHDWeuIBTHcNYIX 8VKxU87lBILoixOb1yTsb0IIeSSv4iJdp+8WE3dyLhobeDOgw8g9Ed3gMOuQHagVuAuB XkE65ijxdWuoctWKif5pI0tBs5vmfgecztfkRgiHsQcfr44nF9V7gxfiTwe0pVBDjVdd IGgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:organization:references :mail-followup-to:date:in-reply-to:message-id:user-agent :mime-version:content-transfer-encoding; bh=sdWu8D1SyEStzr8x4AbRpHfAtnEVjQe0OtG/f9YnGGY=; b=ouQgfoEVUr3LsmhBaA3Bt1zVOZzZOV96YqcoL06n4mISSVyjS7xcFZGbokWpbGm+KS FAfBfuAqYqQur70J3eAO4H8V6W+ypH/J11K6Nt7aHdsNkqOD/AJjdSaGli0nJTuwl+Jj nuSRmHt4bsrL0LpH2wEM7dMd1i0xVdFOm/H54krHf6tlVsWVifzPteiu/zsFIb6vAvtg 6d76jjOrYGvpzzhk0Rnuu9d/zIJ9aUgx9lobWu8aFbYZqsO8kj0r0dHeT3KKApEo6I8n sHVNdMpi0n2dwZS+vyqiZOhRwsatte3Vhu/l/3+D6n43ppuUw7mJ5hyaCs8QvtLGH9OK Ie+g== X-Gm-Message-State: AOAM531eHbbaQ/b2Pol1d6EgDSDoDYSixOqXGB5/RJsdirtMnalQcBl9 cRhF+/uquhkWkiYxiAr4VsVTlGt2WIYa9g== X-Google-Smtp-Source: ABdhPJzW7WPTOivHp8RhAOVumpBHnok9mZABHfUHXunJ/vr9Mw3J8YWpizmJr3MPl7HaxUhbydXMbg== X-Received: by 2002:a17:90a:f68c:: with SMTP id cl12mr7987601pjb.213.1608362250395; Fri, 18 Dec 2020 23:17:30 -0800 (PST) Original-Received: from lt ([2405:201:5c06:70bb:a64e:31ff:fe0c:338c]) by smtp.gmail.com with ESMTPSA id b2sm10314401pff.79.2020.12.18.23.17.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Dec 2020 23:17:30 -0800 (PST) Mail-Followup-To: Stefan Monnier , emacs-devel@gnu.org In-Reply-To: (Stefan Monnier's message of "Sat, 19 Dec 2020 00:33:47 -0500") Received-SPF: none client-ip=2607:f8b0:4864:20::1035; envelope-from=pankaj@codeisgreat.com; helo=mail-pj1-x1035.google.com X-Spam_score_int: -15 X-Spam_score: -1.6 X-Spam_bar: - X-Spam_report: (-1.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:261235 Archived-At: Stefan Monnier 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=3Dorigin/main > git merge Worked. My =E2=80=98master=E2=80=99 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. >