emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Max Nikulin <manikulin@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: Release 9.5
Date: Sat, 2 Oct 2021 14:28:40 +0700	[thread overview]
Message-ID: <sj91nb$d9j$1@ciao.gmane.io> (raw)
In-Reply-To: <87czopxux8.fsf@iki.fi>

On 01/10/2021 10:53, Jarmo Hurri wrote:
> Bastien writes:
> 
> I just ran 'git pull' and got a warning and an error:
> 
> warning: redirecting to https://git.savannah.gnu.org/git/emacs/org-mode.git/
> Your configuration specifies to merge with the ref 'refs/heads/maint'
> from the remote, but no such ref was fetched.

Maybe you are trying to pull while you are on master branch from old 
orgmode.org repository. You should either remove or rename old remote

     git remote rm origin

or

     git remote rename origin orgmode_org

and

     git remote add origin 
https://git.savannah.gnu.org/git/emacs/org-mode.git
     git fetch origin
     git checkout main  # or bugfix

Even if you already added new repository earlier then maybe you are 
still on the master branch from old repository. Run "git fetch" with 
proper remote name and

     git checkout main
     git pull

(not "maint" that is "bugfix" now) should help. The commands that should 
help to determine current state of your repository

     git remote -v show
     git status -sb

> Do I need to start a new clone from scratch, or is there a fix for this?

Git may works with several remotes, so it is not necessary.

> (I honestly have _no recollection_ of what changes I have made, and what
> changes need to be made, to the cloned repository locally in order for
> 'make' to run successfully.)

If you have a personal local branch, checkout it and rebase to "main" or 
"bugfix". If it is (or was) tracking remote changes, it may require 
adjustment.



  parent reply	other threads:[~2021-10-02  7:29 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-29 21:25 Bastien
2021-09-30  7:41 ` Pankaj Jangid
2021-09-30 15:49   ` Bastien
2021-10-01 13:42     ` Pankaj Jangid
2021-10-09 15:48   ` flow
2021-10-01  3:53 ` Jarmo Hurri
2021-10-02  5:00   ` Bastien
2021-10-02  7:28   ` Max Nikulin [this message]
2021-10-02 23:54     ` Thomas S. Dye
2021-09-30 16:31 autofrettage

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='sj91nb$d9j$1@ciao.gmane.io' \
    --to=manikulin@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).