From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <raorn@cnt.ru>
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00 autolearn=ham
	version=3.2.5
Date: Thu, 23 Oct 2008 22:51:19 +0400
From: "Alexey I. Froloff" <raorn@altlinux.ru>
To: ALT Devel discussion list <devel@lists.altlinux.org>
Message-ID: <20081023185119.GI21185@altlinux.org>
References: <4900B695.2080100@altlinux.org>
	<20081023175213.GE21185@altlinux.org>
	<4900BE3C.1090206@altlinux.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="BghK6+krpKHjj+jk"
Content-Disposition: inline
In-Reply-To: <4900BE3C.1090206@altlinux.org>
User-Agent: Mutt/1.5.18 (2008-05-29)
Subject: Re: [devel] gear: build from branch
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: Thu, 23 Oct 2008 18:51:21 -0000
Archived-At: <http://lore.altlinux.org/devel/20081023185119.GI21185@altlinux.org/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>


--BghK6+krpKHjj+jk
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

* Vitaly Ostanin <vyt@> [081023 22:18]:
> >> =DE=C9=D4=C1=CC, =CE=C5 =D0=CF=CD=CF=C7=CC=CF. =EE=C1=D0=D2=C9=CD=C5=
=D2, git-merge -s ours . upstream =CE=C5=20
> >> =D2=C1=C2=CF=D4=C1=C5=D4:
> >> . - not something we can merge
> > merge !=3D pull, =C5=CD=D5 =CE=C5 =CE=C1=C4=CF =D5=CB=C1=DA=D9=D7=C1=D4=
=D8 =D2=C5=CD=CF=D4=D5, =CF=CE =CD=C5=D2=D6=C9=D4 =D7 HEAD.
> =F1 =CF=D2=C9=C5=CE=D4=C9=D2=CF=D7=C1=CC=D3=D1 =CE=C1 =DC=D4=CF =D0=C9=D3=
=D8=CD=CF:
> http://lists.altlinux.org/pipermail/devel/2008-April/072689.html
=E1, =CE=D5 =D4=C1=CD =D0=D2=C9=CD=C5=D2=C1 =CE=C5=D4.

git-merge -s ours upstream

--=20
Regards,
Sir Raorn.

--BghK6+krpKHjj+jk
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iD8DBQFJAMejVqT7+fkT8woRApf5AJ0a5NbKfvxv5OcrHPYwhgcrpG2Z4ACfUgMt
BIzCm1LgSYZrZHlZ8Xhh9XY=
=gDey
-----END PGP SIGNATURE-----

--BghK6+krpKHjj+jk--