From: Matthias Fechner <idefix@fechner.net>
Date: Tue, 21 Sep 2010 10:52:52 GMT
Subject: Re: Update Webservers from a remote repository
Message-ID: <4C988E84.8020702@fechner.net>
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