Re: Update Webservers from a remote repository

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]