From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Tue, 21 Sep 2010 09:41:28 GMT
Subject: Re: Update Webservers from a remote repository
Message-ID: <20100921094128.GA13619@LK-Perkele-V2.elisa-laajakaista.fi>
In-Reply-To: <4C9874BB.5060908@fechner.net>

On Tue, Sep 21, 2010 at 11:02:51AM +0200, Matthias Fechner wrote:
> 
> If I understood everything correctly I execute the following
> commands on each server:
> git checkout master (to be sure we are on branch master)
> git fetch (to fetch changes from the central repository)
> git merge origin (to update the repo to the changes on the central repo)
> 
> Is that correct or did I missed something?

I would do it the following way:

git checkout -f master
git fetch origin
git reset --hard orgin/master


You definitely do not want to run merge non-interactively (conflict risk!)

-Ilari