ALT Linux Sisyphus discussions
 help / color / mirror / Atom feed
From: "Евгений Терешков" <evg-krsk@yandex.ru>
To: ALT Linux Sisyphus discussions <sisyphus@lists.altlinux.org>
Subject: Re: [sisyphus] error: minitube.git tag `2.2-alt2' is not inherited from /gears/m/minitube.git branch `sisyphus'
Date: Thu, 14 Aug 2014 16:22:41 +0800
Message-ID: <m3y4urh44u.fsf@thinkpad.evg-krsk.dyndns.org> (raw)
In-Reply-To: <1408002054.575315705@f339.i.mail.ru>

"Дворник =" пишет:

> сделал такие телодвижения
>   git remote add gears git://git.altlinux.org/gears/m/minitube.git
>   git fetch gears

>   git merge -s ours gear/sisyphus
> выдало 
>   merge: gear/sisyphus - not something we can merge
              ^
похоже, что здесь опечатка (не хватает "s")

-- 
С уважением, Терешков Евгений.
Jabber ID: evg@altlinux.org, evg_krsk@jabber.ru

       reply	other threads:[~2014-08-14  8:22 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-14  8:22 ` Евгений Терешков [this message]
2014-08-14  9:20     ` Евгений Терешков

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

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

  git send-email \
    --in-reply-to=m3y4urh44u.fsf@thinkpad.evg-krsk.dyndns.org \
    --to=evg-krsk@yandex.ru \
    --cc=sisyphus@lists.altlinux.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

ALT Linux Sisyphus discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://lore.altlinux.org/sisyphus/0 sisyphus/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 sisyphus sisyphus/ http://lore.altlinux.org/sisyphus \
		sisyphus@altlinux.ru sisyphus@altlinux.org sisyphus@lists.altlinux.org sisyphus@lists.altlinux.ru sisyphus@lists.altlinux.com sisyphus@linuxteam.iplabs.ru sisyphus@list.linux-os.ru
	public-inbox-index sisyphus

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://lore.altlinux.org/org.altlinux.lists.sisyphus


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git