Re: What's cooking in git.git (topics)
- From
Jeff King <peff@peff.net>
- Date
- Jun 30, 2008, 05:33 UTC
- Message-ID
- <20080630053302.GA23786@sigill.intra.peff.net>
- In-Reply-To
- <7vwsk74hgr.fsf@gitster.siamese.dyndns.org>
On Sun, Jun 29, 2008 at 10:31:00PM -0700, Junio C Hamano wrote:
Show 12 quoted lines
> > Where do we want to take this? The conversation went something like: > > > > me: here's a patch where we hint about "remote prune" > > you: why not just fix the refs, it's no worse than a rewind > > me: we kill reflogs, so it is different than a rewind > > you: oh, right > > > > So I'm not sure if that was "Oh, right, it's not a good idea to remove > > the conflicting ref" or "Oh, right, but it's probably still fine." > > It is "Oh right, it is Ok. Let's cook it in 'next', have it in 'master' > and then backmerge to 'maint'".
Sorry if I'm being slow, but what is "it" here? The "warning" patch I sent, or a to-be-posted patch that deletes the conflicting ref?
-Peff