From: Sergey V Turchin <zerg@altlinux.org>
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
Subject: Re: [devel] [#91573] FAILED (try 5) srpm=llvm-3.2-alt1.src.rpm mesa.git=9.1-alt1 opengtl.git=0.9.18-alt1 ...
Date: Fri, 01 Mar 2013 17:06:47 +0400
Message-ID: <2530337.iROIGGF4sK@summoner.localdomain> (raw)
In-Reply-To: <1362140134.6792.1.camel@marsh.inozemtsev.org>
[-- Attachment #1: Type: text/plain, Size: 283 bytes --]
On Friday 01 March 2013 16:15:34 Valery V wrote:
[...]
> как в современной реальности это принято фиксить?
В качестве костыля -- git merge -s ours gears/sisyphus
--
Regards, Sergey. ALT Linux, http://www.altlinux.ru/
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2013-03-01 13:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-01 12:15 ` Valery V. Inozemtsev
2013-03-01 13:06 ` Sergey V Turchin [this message]
2013-03-01 13:22 ` Michael Shigorin
2013-03-01 13:47 ` Dmitry V. Levin
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=2530337.iROIGGF4sK@summoner.localdomain \
--to=zerg@altlinux.org \
--cc=devel@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 Team development discussions
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://lore.altlinux.org/devel/0 devel/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 devel devel/ http://lore.altlinux.org/devel \
devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
public-inbox-index devel
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://lore.altlinux.org/org.altlinux.lists.devel
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git