git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Update Webservers from a remote repository

From
ILIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Date
Sep 21, 2010, 09:41 UTC
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:
Show 8 quoted lines
> 
> 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
Previous: Matthias FechnerNext: Matthias Fechner
Message 2 of 3 in “Update Webservers from a remote repository”
  1. Matthias FechnerSep 21, 2010
  2. Ilari LiusvaaraSep 21, 2010
  3. Matthias FechnerSep 21, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.