Re: Submodule/contents conflict
- From
Jeff King <peff@peff.net>
- Date
- Apr 25, 2017, 03:39 UTC
- Message-ID
- <20170425033907.klufatsa7afcnfuu@sigill.intra.peff.net>
- In-Reply-To
- <20170425032242.wlmqrkgkeg3ytfle@sigill.intra.peff.net>
On Mon, Apr 24, 2017 at 11:22:42PM -0400, Jeff King wrote:
Show 7 quoted lines
> > > It also has a similarity to > > > https://public-inbox.org/git/1492287435.14812.2.camel@gmail.com/ regarding > > > how checkout operates. > > I didn't look too deeply into this one, but it really looks like > somebody caring too much about when git needs to write (and I'd suspect > it's impacted by the racy-git thing, too).
Oh, sorry, I got this confused with:
https://public-inbox.org/git/CAM1zWBtfgHT=pT0pidQo1HD=DfrXLG3gNaUvs0vZKvYfG1BHFw@mail.gmail.com/
which was mentioned earlier (and which I do think is just about timestamps).
I don't think any of what I said is related to the doc update in
https://public-inbox.org/git/1492287435.14812.2.camel@gmail.com/
which seems reasonable to me.
-Peff