From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Fri, 10 Nov 2006 21:06:42 +0300 From: =?koi8-r?B?5MXOydMg883J0s7P1w==?= To: devel@lists.altlinux.org Message-ID: <20061110180642.GA17373@localhost.localdomain> References: <200611101654.41050.icesik@mail.ru> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="bp/iNruPH9dso1Pn" Content-Disposition: inline In-Reply-To: <200611101654.41050.icesik@mail.ru> Subject: Re: [devel] =?koi8-r?b?ydPQz8zY2s/Xwc7JxSBnaXQ=?= X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.9rc1 Precedence: list Reply-To: ALT Devel discussion list List-Id: ALT Devel discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 18:07:08 -0000 Archived-At: List-Archive: List-Post: --bp/iNruPH9dso1Pn Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Nov 10, 2006 at 04:54:37PM +0200, Igor Zubkov wrote: IZ> server1 (prod) =CE=C1 =CE=A3=CD =D7 git =D0=CF=CC=CF=D6=C5=CE =CB=CF=CE= =D4=C5=CE=D4 =D3=C1=CA=D4=C1. IZ> server2 (test) =CE=C1 =CE=A3=CD =D1 =C4=C5=CC=C1=C0 git clone =D3 serve= r1. =F0=CF=CB=C1 =D7=D3=A3 =D2=C1=C2=CF=D4=C1=C5=D4. =F2=C5=CB=CF=CD=C5=CE=C4=D5=C0 =D3=C4=C5=CC=C1=D4=D8 =C5=DD=A3 =CF=C4=C9=CE= =D3=CE=C1=D0=DB=CF=D4 -- =CE=C1 =D2=C1=C2=CF=DE=C5=CA =CD=C1=DB=C9=CE=CB= =C5. =ED=CE=C5 =D4=C1=CB =CF=CB=C1=DA=C1=CC=CF=D3=D8 =D5=C4=CF=C2=CE=C5=C5. IZ> =E9=C4=D5 =CE=C1 server2 =C9 =D0=D9=D4=C1=C0=D3=D8 =D4=C1=CD =D3=C4=C5= =CC=C1=D4=D8 push =CE=C1 server1. =E1 =CF=CE=CF =D7=C1=CC=C9=D4=D3=D1 =D7= =CF=D4 =D3=20 IZ> =D4=C1=CB=C9=CD: IZ> [user@server2 www]# git push IZ> user@server1's password: IZ> error: remote 'refs/heads/master' is not a strict subset of local=20 IZ> ref 'refs/heads/master'. maybe you are not up-to-date and need to pull = first? IZ> [user@server2 www]# =20 =F1 =DC=D4=CF =D2=C5=DB=C1=C0 =D4=C1=CB: - =C2=D2=C1=CE=DE real/server1 - =C2=D2=C1=CE=DE real/server2 =FC=D4=CF =D2=C1=DA=CE=D9=C5 =C2=D2=C1=CE=DE=C9. =E9 =CF=D4=C4=C5=CC=D8=CE= =CF =C2=D2=C1=CE=DE master, =DE=C5=D2=C5=DA =CB=CF=D4=CF=D2=D9=CA =D1 =C9 = =CF=C2=CD=C5=CE=C9=D7=C1=C0=D3=D8 =CD=C5=D6=C4=D5 =D3=C5=D2=D7=C5=D2=C1=CD=C9. --=20 =F3 =D5=D7=C1=D6=C5=CE=C9=C5=CD, =E4=C5=CE=C9=D3 http://freesource.info ---------------------------------------------------------------------------- =FA=E1=EB=EF=EE =EC=E1=E2=EF=F2=E1=F4=EF=F2=E9=E9 =E6=E5=F4=E1 =EE=C9=CB=CF=C7=C4=C1 =CE=C5 =D0=D9=D4=C1=CA=D4=C5=D3=D8 =D0=CF=D7=D4=CF= =D2=C9=D4=D8 =D5=C4=C1=DE=CE=D9=CA =DC=CB=D3=D0=C5=D2=C9=CD=C5=CE=D4. --bp/iNruPH9dso1Pn Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iD8DBQFFVL+xPuR8c4jhFKIRAoCiAJ4jwxqGpbCZxC6YQA6rAT0IuXrlJwCgnly7 okn49/B5aH5IXKRwRuIrObY= =eZJ0 -----END PGP SIGNATURE----- --bp/iNruPH9dso1Pn--