Messages in this thread | | | From | Linus Torvalds <> | Date | Wed, 8 May 2019 13:21:14 -0700 | Subject | Re: GFS2: Pull Request |
| |
On Wed, May 8, 2019 at 1:17 PM Andreas Gruenbacher <agruenba@redhat.com> wrote: > > Would it make sense to describe how to deal with merge conflicts in > Documentation/maintainer/pull-requests.rst to stop people from getting > this wrong over and over again?
Probably. I do think it got written up at some point (lwn or something like that), but it's possible it never got made into an actual documentation file..
Anybody want to try to massage that email into the appropriate doc file?
Linus
| |