From: Jeff King Date: Tue, 29 Jul 2008 04:31:17 GMT Subject: Re: theirs/ours was Re: [PATCH 6/6] Add a new test for using a custom merge strategy Message-ID: <20080729043117.GB26997@sigill.intra.peff.net> In-Reply-To: On Tue, Jul 29, 2008 at 02:09:18AM +0200, Sverre Rabbelier wrote: > > 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.) I think you are missing the fact that he is doing this push _after_ having merged the history into master via "-s ours". So it is a fast-forward to push at that point. -Peff