From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <rider@altlinux.com>
Message-ID: <49368058.6010209@altlinux.com>
Date: Wed, 03 Dec 2008 15:49:28 +0300
From: Anton Farygin <rider@altlinux.com>
User-Agent: Thunderbird 2.0.0.18 (X11/20081125)
MIME-Version: 1.0
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
Content-Type: text/plain; charset=KOI8-R; format=flowed
Content-Transfer-Encoding: 8bit
Subject: [devel] =?koi8-r?b?0NLPwszFzdkg0yBnaXQ=?=
X-BeenThere: devel@lists.altlinux.org
X-Mailman-Version: 2.1.10b3
Precedence: list
Reply-To: ALT Linux Team development discussions <devel@lists.altlinux.org>
List-Id: ALT Linux Team development discussions <devel.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel>
List-Post: <mailto:devel@lists.altlinux.org>
List-Help: <mailto:devel-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Dec 2008 12:51:26 -0000
Archived-At: <http://lore.altlinux.org/devel/49368058.6010209@altlinux.com/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>

Опять эти 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