From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <470CBA5F.4020801@neural.ru> Date: Wed, 10 Oct 2007 14:41:19 +0300 From: Ivan Fedorov User-Agent: Thunderbird 2.0.0.6 (X11/20070804) MIME-Version: 1.0 To: ALT Linux Team development discussions References: <20071010001705.GA13211@lks.home> <679044850710100310r4b00eea7t66313f4c02d25363@mail.gmail.com> <20071010151758.9ea19764.bga@altlinux.org> In-Reply-To: <20071010151758.9ea19764.bga@altlinux.org> X-Enigmail-Version: 0.95.2 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig2CD8D9C11027DC98E6F6A029" Subject: Re: [devel] Q: git fake merge X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.9 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Oct 2007 11:41:28 -0000 Archived-At: List-Archive: List-Post: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig2CD8D9C11027DC98E6F6A029 Content-Type: text/plain; charset=windows-1251 Content-Transfer-Encoding: quoted-printable Grigory Batalov =EF=E8=F8=E5=F2: > On Wed, 10 Oct 2007 14:10:46 +0400 > Damir Shayhutdinov wrote: >=20 >>> =C4=EE=EF=F3=F1=F2=E8=EC, =F3 =EC=E5=ED=FF =E5=F1=F2=FC =ED=E5=EA=E8=E9= =E1=F0=E0=ED=F7, =E2 =EA=EE=F2=EE=F0=FB=E9 =FF =F5=EE=F7=F3 =FF=EA=EE=E1= =FB =F1=EC=E5=F0=E6=E8=F2=FC =ED=E5=EA=E8=E9 >>> =E4=F0=F3=E3=EE=E9 =E1=F0=E0=ED=F7. =D7=F2=EE =E7=ED=E0=F7=E8=F2 "=FF= =EA=EE=E1=FB" - =F7=F2=EE=E1=FB =EF=EE-=F4=E0=EA=F2=F3 =F2=E0=EC =ED=E5 =EC= =E5=ED=FF=EB=E8=F1=FC, >>> =EE=E1=ED=EE=E2=E8=EB=E0=F1=FC =F2=EE=EB=FC=EA=EE =E8=F1=F2=EE=F0=E8=FF= =EA=EE=EC=EC=E8=F2=EE=E2. =CA=E0=EA =FD=F2=EE =EC=EE=E6=ED=EE =F1=E4=E5=EB= =E0=F2=FC? >> git-merge -s ours >> >> =C6=E0=EB=EA=EE =F7=F2=EE =ED=E5=F2=F3 git-merge -s theirs, =FD=F2=EE = =E8=ED=EE=E3=E4=E0 =F2=EE=E6=E5 =EF=EE=EB=E5=E7=ED=EE. >=20 > =C0 =E5=F1=EB=E8 =EF=E5=F0=E5=EA=EB=FE=F7=E8=F2=FC=F1=FF =ED=E0 "=F2=EE= =F2" =E1=F0=E0=ED=F7 =E8 =F1=E4=E5=EB=E0=F2=FC git-merge -s ours, > =ED=E5 =EF=EE=EC=EE=E6=E5=F2? =3D) >=20 =E0 =E5=F1=EB=E8 "=F2=EE=F2" =E1=F0=E0=ED=F7 =F0=E5=EC=EE=F2=ED=FB=E9? :)= --------------enig2CD8D9C11027DC98E6F6A029 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFHDLpjMJy3oC+NmVsRArDHAJ4uFop4Wd9WjnfbvwX1SiJdOsNo4QCfbxJX tOwGE6vhR1jtyM47pdZLlmQ= =WfbE -----END PGP SIGNATURE----- --------------enig2CD8D9C11027DC98E6F6A029--