Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1510782
| From | Jonathan Corbet <corbet@lwn.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: bad merge in the jc_docs tree |
| Date | 2016-10-28 02:00 +0200 |
| Message-ID | <sx2Ky-gY-9@gated-at.bofh.it> (permalink) |
| References | <sx2r7-9r-9@gated-at.bofh.it> |
| Organization | LWN.net |
On Fri, 28 Oct 2016 10:30:29 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> I noticed that you left some conflict markers in
> Documentation/admin-guide/index.rst in merge commit
>
> 7a6992dc952e ("Merge branch 'doc-tweaks' into docs-next")
Argh. I noticed that too, but failed to amend the merge before pushing.
Thanks for the heads-up.
jon
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
linux-next: bad merge in the jc_docs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-10-28 01:40 +0200 Re: linux-next: bad merge in the jc_docs tree Jonathan Corbet <corbet@lwn.net> - 2016-10-28 02:00 +0200
csiph-web