From: Max Ivanov <ivanov.maxim@gmail.com>
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
Subject: Re: [devel] Помогите забороть git
Date: Sat, 7 Mar 2009 07:08:45 -0500
Message-ID: <fbfa7b0c0903070408h5ea93ad3v721319cc6ef7fef7@mail.gmail.com> (raw)
In-Reply-To: <4d6cc2f20903070224l671cc331xde25df6bcffbd30@mail.gmail.com>
То что будет находиться в подкаталоге не должно конфиликтовать с тем
что там уже есть в текущем бранче. Как видно у тебя уже там что-то
валяется.
> $ git merge -s ours --no-commit teambzr
> Automatic merge went well; stopped before committing as requested
> $ git read-tree --prefix=<prefix>/ -u teambzr
> error: Entry '<prefix>/AUTHORS' overlaps with '<prefix>/AUTHORS'. Cannot bind.
next prev parent reply other threads:[~2009-03-07 12:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-05 18:41 Boris Savelev
2009-03-05 18:42 ` Mikhail Gusarov
2009-03-05 19:19 ` Boris Savelev
2009-03-05 19:26 ` Boris Savelev
2009-03-06 6:23 ` Max Ivanov
2009-03-07 10:24 ` Boris Savelev
2009-03-07 12:08 ` Max Ivanov [this message]
2009-03-07 13:22 ` Boris Savelev
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=fbfa7b0c0903070408h5ea93ad3v721319cc6ef7fef7@mail.gmail.com \
--to=ivanov.maxim@gmail.com \
--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