From: "Денис Смирнов" <mithraen@altlinux.ru>
To: devel@lists.altlinux.org
Subject: Re: [devel] использование git
Date: Fri, 10 Nov 2006 21:06:42 +0300
Message-ID: <20061110180642.GA17373@localhost.localdomain> (raw)
In-Reply-To: <200611101654.41050.icesik@mail.ru>
[-- Attachment #1: Type: text/plain, Size: 995 bytes --]
On Fri, Nov 10, 2006 at 04:54:37PM +0200, Igor Zubkov wrote:
IZ> server1 (prod) на нём в git положен контент сайта.
IZ> server2 (test) на нём я делаю git clone с server1. Пока всё работает.
Рекомендую сделать ещё один снапшот -- на рабочей машинке. Мне так
оказалось удобнее.
IZ> Иду на server2 и пытаюсь там сделать push на server1. А оно валится вот с
IZ> таким:
IZ> [user@server2 www]# git push
IZ> user@server1's password:
IZ> error: remote 'refs/heads/master' is not a strict subset of local
IZ> ref 'refs/heads/master'. maybe you are not up-to-date and need to pull first?
IZ> [user@server2 www]#
Я это решаю так:
- бранч real/server1
- бранч real/server2
Это разные бранчи. И отдельно бранч master, через который я и обмениваюсь
между серверами.
--
С уважением, Денис
http://freesource.info
----------------------------------------------------------------------------
ЗАКОН ЛАБОРАТОРИИ ФЕТА
Никогда не пытайтесь повторить удачный эксперимент.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2006-11-10 18:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-10 14:54 Igor Zubkov
2006-11-10 18:06 ` Денис Смирнов [this message]
2006-11-13 14:09 ` Igor Zubkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061110180642.GA17373@localhost.localdomain \
--to=mithraen@altlinux.ru \
--cc=devel@lists.altlinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
ALT Linux Team development discussions
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
public-inbox-index devel
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://lore.altlinux.org/org.altlinux.lists.devel
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git