From: Sverre Rabbelier <alturin@gmail.com>
Date: Tue, 29 Jul 2008 00:09:18 GMT
Subject: Re: theirs/ours was Re: [PATCH 6/6] Add a new test for using a custom merge strategy
Message-ID: <bd6139dc0807281709u43218e97p8ba239f3e520e10@mail.gmail.com>
In-Reply-To: <alpine.DEB.1.00.0807290123300.2725@eeepc-johanness>

On Tue, Jul 29, 2008 at 01:27, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> To me, this suggests that they were too married to 'production' being the
> "dominant" branch.

<snip>

> If the result should become the state of 'x', too, I would then just
> 'git push origin y:x'.

But this means that everybody doing a 'git pull' on that repo will get
complaints when pulling, right? Should they just send out a message to
all their users that they'll need to rebase all their changes now?
(Not being sarcastic, am trying to work out what the recommended
workflow is here.)

-- 
Cheers,

Sverre Rabbelier