Messages in this thread | | | Date | Wed, 8 May 2019 14:58:18 -0600 | From | Jonathan Corbet <> | Subject | Re: GFS2: Pull Request |
| |
On Wed, 8 May 2019 22:17:12 +0200 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?
I think this certainly belongs in the maintainer manual, but probably not in pull-requests.rst. There are a lot of things about repository management that seem to trip up even experienced maintainers; pre-pull merges is just one of those. I would love to see a proper guide on when and how to do merges in general.
CCing Dan, who has ambitions for the maintainer manual as well, just in case he has anything in mind here.
Thanks,
jon
| |