From: Matthias Fechner <idefix@fechner.net>
To: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Cc: git@vger.kernel.org
Subject: Re: Update Webservers from a remote repository
Date: Tue, 21 Sep 2010 12:52:52 +0200 [thread overview]
Message-ID: <4C988E84.8020702@fechner.net> (raw)
In-Reply-To: <20100921094128.GA13619@LK-Perkele-V2.elisa-laajakaista.fi>
Am 21.09.10 11:41, schrieb Ilari Liusvaara:
> git checkout -f master
> git fetch origin
> git reset --hard origin/master
>
> You definitely do not want to run merge non-interactively (conflict risk!)
oh good point, thanks a lot.
Bye,
Matthias
--
"Programming today is a race between software engineers striving to
build bigger and better idiot-proof programs, and the universe trying to
produce bigger and better idiots. So far, the universe is winning." --
Rich Cook
prev parent reply other threads:[~2010-09-21 10:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-21 9:02 Update Webservers from a remote repository Matthias Fechner
2010-09-21 9:41 ` Ilari Liusvaara
2010-09-21 10:52 ` Matthias Fechner [this message]
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=4C988E84.8020702@fechner.net \
--to=idefix@fechner.net \
--cc=git@vger.kernel.org \
--cc=ilari.liusvaara@elisanet.fi \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).