From: REAL <real@kemsu.ru>
To: ALT Linux Sisyphus discussions <sisyphus@lists.altlinux.org>
Subject: Re: [sisyphus] Покажите правильное решение ошибки: tag `???' is not inherited from ???
Date: Mon, 22 Oct 2012 17:48:31 +0700
Message-ID: <5085247F.20307@kemsu.ru> (raw)
In-Reply-To: <3103452.6bL35u3Gs6@summoner.localdomain>
22.10.2012 17:39, Sergey V Turchin пишет:
> On 21 октября 2012 18:34:47 Roman Savochenko wrote:
>
> [...]
>> - git remote add gears git://git.altlinux.org/gears/k/kdeaddons.git
>> - git merge -s ours git://git.altlinux.org/gears/k/kdeaddons.git
> git merge gears/sisyphus
> (без ours), исправить конфликты и сделать commit -a
А перед merge не забыть
git remote update
--
REAL aka Евгений Ростовцев, программист ЦНИТ КемГУ
next prev parent reply other threads:[~2012-10-22 10:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-21 15:34 Roman Savochenko
2012-10-21 18:14 ` Igor Vlasenko
2012-10-21 18:30 ` Michael Shigorin
2012-10-22 10:39 ` Sergey V Turchin
2012-10-22 10:48 ` REAL [this message]
2012-10-23 7:08 ` Roman Savochenko
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=5085247F.20307@kemsu.ru \
--to=real@kemsu.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