* [devel] проблемы с git
@ 2008-12-03 12:49 Anton Farygin
0 siblings, 0 replies; only message in thread
From: Anton Farygin @ 2008-12-03 12:49 UTC (permalink / raw)
To: ALT Linux Team development discussions
Опять эти submodules.
На этот раз вылезло:
$ git merge psi/master
fatal: cannot read object 2a5efb9071703620ede8a1f4a1c12d14e5754984
'iris': It is a submodule!
Merge with strategy recursive failed.
В каталоге iris находится своя, локальная копия iris (добавленная через
gear-update)
Как я не пытался обойти эту ошибку - не получилось. Может быть что-то
подскажете ?
Rgds,
Rider
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-12-03 12:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-12-03 12:49 [devel] проблемы с git Anton Farygin
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