Re: [PATCH] Re: keeping remote repo checked out?

> Daniel Barkalow <barkalow@iabervon.org> writes:
> 
> > the two-way merge. That is, what I want to have work is:
> >
> >   server$ git checkout production
> >   work$ git push server:production
> >   server$ git checkout
> >
> > and this should leave the working tree on server with the changes pushed 
> > from work.
> 
> I think the approach Linus was suggesting before he suggested
> the funny refs/heads/../.. symlink idea (honestly, I think he
> was half joking) is cleaner, easier to understand, easier to
> implement and generally makes more sense.  Your work cycle would
> become like this:
> 
>     server$ git checkout production
>     work$ git checkout master
>     work$ git pull server production ;# merge into work's master
>     work$ git push server master:receive_from_work
>     server$ git pull . receive_from_work ;# merge into server's production
> 
> and you make sure receive_from_work is not checked out on server
> (or production is never pushed into) and always do fast forward
> and nothing else.