From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Wed, 21 Jul 2010 14:06:56 +0400 From: "Dmitry V. Levin" To: ALT Linux Team development discussions Message-ID: <20100721100656.GC20214@wo.int.altlinux.org> Mail-Followup-To: ALT Linux Team development discussions References: <4C44B89C.8000106@gmail.com> <201007201247.19098.cas@altlinux.ru> <4C456407.1060200@gmail.com> <4C45F128.4010802@solin.spb.ru> <20100720195331.GB767@altlinux.org> <4C4600A1.8070308@solin.spb.ru> <20100720202517.GC767@altlinux.org> <4C4609E6.3020402@solin.spb.ru> <20100721052023.GA20530@mw.office.seiros.ru> <4C46AFF4.6070300@solin.spb.ru> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="B4IIlcmfBL/1gGOG" Content-Disposition: inline In-Reply-To: <4C46AFF4.6070300@solin.spb.ru> X-fingerprint: FE4C 93AB E19A 2E4C CB5D 3E4E 7CAB E6AC 9E35 361E Subject: Re: [devel] git screencast X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 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, 21 Jul 2010 10:06:56 -0000 Archived-At: List-Archive: List-Post: --B4IIlcmfBL/1gGOG Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jul 21, 2010 at 12:29:40PM +0400, Aleksey Avdeev wrote: > 21.07.2010 09:20, =E4=C5=CE=C9=D3 =F3=CD=C9=D2=CE=CF=D7 =D0=C9=DB=C5=D4: > > On Wed, Jul 21, 2010 at 12:41:10AM +0400, Aleksey Avdeev wrote: > >=20 > > AA> =EE=C1 =D7=CB=D5=D3 =C9 =C3=D7=C5=D4 =D7=D3=C5 =C6=CC=CF=CD=C1=D3= =D4=C5=D2=D9 =D2=C1=DA=CE=D9=C5... > >=20 > > =FC=D4=CF =C6=C1=CB=D4. =EB=C1=CB =C9 =D4=CF, =DE=D4=CF =C6=CC=CF=CD=C1= =D3=D4=C5=D2=D9 =CE=C5 =D3=D4=CF=C9=D4 =D0=D2=CF=C2=CF=D7=C1=D4=D8 =CE=C1 = =D7=CB=D5=D3, =C5=D3=CC=C9 > > =DA=C4=CF=D2=CF=D7=D8=C5 =C4=CF=D2=CF=C7=CF. > >=20 > > =F4=CF=DE=CE=CF =D4=C1=CB=D6=C5 =CE=C5 =D3=D4=CF=C9=D4 =D0=D2=CF=D0=C1= =C7=C1=CE=C4=C9=D2=CF=D7=C1=D4=D8 =D3=CC=CF=D6=CE=D9=C5 =CE=C5=D5=C4=CF=C2= =CE=D9=C5 =D3=C8=C5=CD=D9 =D2=C1=C2=CF=D4=D9. >=20 > =ED=CF=D1 =D3=C8=C5=CD=C1 =D2=C1=C2=CF=D4=D9 =D0=CF=DA=D7=CF=CC=D1=C5= =D4: >=20 > 1. =E9=CD=C5=D4=D8 =C2=C9=C2=CC=C9=CF=D4=C5=CB=D5 _=C7=CF=D4=CF=D7=D9=C8_= =C2=CC=CF=CB=CF=D7 =D3=D0=C5=CB=CF=D7 =D2=C5=DB=C1=C0=DD=C9=C8 =D4=C9=D0= =CF=D7=D9=C5 =DA=C1=C4=C1=DE=C9 (=D7 > =D4=CF=CD =DE=C9=D3=CC=C5 -- =DE=C1=D3=D4=CF =D7=D3=D4=D2=C5=DE=C1=C0=DD= =C9=C5=D3=D1 =CB=CF=CD=C2=C9=CE=C1=C3=C9=C9 =DA=C1=C4=C1=DE). =ED=D9 =DC=D4=CF =D5=D6=C5 =CF=C2=D3=D5=D6=C4=C1=CC=C9. =E9=CD=C5=CE=CE=CF= =C7=CF=D4=CF=D7=CE=CF=D3=D4=D8 =DC=D4=C9=C8 =C2=CC=CF=CB=CF=D7, =C1 =C9=CD= =C5=CE=CE=CF, =D0=D2=C9=CD=C5=CE=C9=CD=CF=D3=D4=D8 =DC=D4=C9=C8 =C2=CC=CF=CB=CF=D7 =D7=D9= =DA=D9=D7=C1=C5=D4 =D3=CF=CD=CE=C5=CE=C9=D1. =F1 =C4=D5=CD=C1=C0, =DE=D4= =CF =D0=CF=D0=D9=D4=CB=C1 =C9=D3=D0=CF=CC=D8=DA=CF=D7=C1=D4=D8 =CC=C0=C2=CF=CA =C9=DA =DC=D4=C9=C8 = =C2=CC=CF=CB=CF=D7 =D7=D9=DA=D9=D7=C1=C5=D4 merge conflict. =E5=D3=CC=C9 =DC=D4=CF =CE=C1=DA=D9=D7=C1=C5=D4=D3=D1 =C7=CF=D4=CF=D7=CE=CF= =D3=D4=D8=C0, =D4=CF =DE=D4=CF =D6=C5 =D4=C1=CB=CF=C5 =D4=CF=C7=C4=C1 =CE= =C5=C7=CF=D4=CF=D7=CE=CF=D3=D4=D8? > 2. =F2=C1=DA=D7=C9=D7=C1=D4=D8 =C9 =C4=CF=D2=C1=C2=C1=D4=D9=D7=C1=D4=D8 = =C4=C1=CE=CE=D9=C5 =C2=CC=CF=CB=C9 =D3 =D3=CF=C8=D2=C1=CE=C5=CE=C9=C5=CD = =C9=D3=D4=CF=D2=C9=C9. (=EE=C5 =D7=D3=A3 > =D5=C4=C1=A3=D4=D3=D1 =D3=C4=C5=CC=C1=D4=D8 =C9=C4=C5=C1=CC=D8=CE=D9=CD = =D3=D2=C1=DA=D5. =E9 =C9=DA=CD=C5=CE=C5=CE=C9=D1 =D3=D2=C5=C4=D9 =D4=CF=D6= =C5 =CE=C1=C4=CF =D5=DE=C9=D4=D9=D7=C1=D4=D8.) >=20 > 3. =F0=D2=CF=D3=D4=D9=CD (=D4=CF=DE=CE=C5=C5 =D3=D4=C1=CE=C4=C1=D2=D4=CE= =D9=CD) =CF=C2=D2=C1=DA=CF=CD =CF=C2=CE=CF=D7=CC=D1=D4=D8 =C2=CC=CF=CB=C9 = =D5=D6=C5 =D7=CE=C5=D3=A3=CE=CE=D9=C5 =D7 > =D3=D0=C5=CB. =ED=CE=C5 =CB=C1=D6=C5=D4=D3=D1, =DE=D4=CF =D0=CF=D0=D9=D4=CB=C1 =D7=D9=D0= =CF=CC=CE=C9=D4=D8 =CC=C0=C2=CF=C5 =CF=C2=CE=CF=D7=CC=C5=CE=C9=C5 =D4=C1=CB= =CF=C7=CF =D2=CF=C4=C1 =C2=D5=C4=C5=D4 =D0=D2=C9=D7=CF=C4=C9=D4=D8 =CB =D3=D4=C1=CE=C4=C1=D2=D4=CE=CF=CD=D5 merge = conflict. =EE=D5 =D2=C1=DA=D7=C5 =DC=D4=CF =CE=C5 =DA=C1=CD=C5=DE=C1=D4=C5= =CC=D8=CE=CF? > =E4=C1, =CD=CF=D1 =D3=C8=C5=CD=C1 =CE=C5 =C9=C4=C5=C1=CC=D8=CE=C1. =EE= =CF =D5 =CE=C1=D3 =C5=D3=D4=D8 =C4=D2=D5=C7=CF=CA =CD=C5=C8=C1=CE=C9=DA=CD = =D2=C5=DB=C5=CE=C9=D1 > =D7=D9=DB=C5=CF=DA=CE=C1=DE=C5=CE=CE=D9=C8 =DA=C1=C4=C1=DE? (=F1 =D7=C9= =D6=D5 =D4=CF=CC=D8=CB=CF =D7=C1=D2=C9=C1=CE=D4=D9 =D4=C9=D0=C1 "=F3=CD=CF= =D4=D2=C9 =C4=C1=CE=CE=D9=CA =D3=D0=C5=CB =C9 > =C4=C5=CC=C1=CA =D4=C1=CB=D6=C5"...) =F1 =CE=C5 =D7=C9=D6=D5 =D0=D2=C9=CE=C3=C9=D0=C9=C1=CC=D8=CE=CF=CA =D2=C1= =DA=CE=C9=C3=D9 =CD=C5=D6=C4=D5 =DC=D4=CF=CA =D3=C8=C5=CD=CF=CA =C9 =D3=C8= =C5=CD=CF=CA "=D3=CD=CF=D4=D2=C9 =C4=C1=CE=CE=D9=CA =D3=D0=C5=CB =C9 =C4=C5=CC=C1=CA =D4=C1=CB=D6=C5": =D7 =CF=C2=CF=C9=C8 =D3= =CC=D5=DE=C1=D1=C8 =D4=D2=C5=C2=D5=C5=D4=D3=D1 =CD=C5=D2=D6=C9=D4=D8 =C9=DA= =CD=C5=CE=C5=CE=C9=D1 =D7=D2=D5=DE=CE=D5=C0. --=20 ldv --B4IIlcmfBL/1gGOG Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkxGxsAACgkQfKvmrJ41Nh4LagCfU3W0G7sGcDHmR60JmvpQC15G PXEAn1W1FSLuHBkt/AgAqldibirYLZsb =GC6Z -----END PGP SIGNATURE----- --B4IIlcmfBL/1gGOG--