My (perhaps unsolicited) opinion is that the person who merges the PR/commits their own changes should carry it through to the upstream branch(es). That way it's always tidy and there's no questions when the next person goes to merge changes to code they're familiar with.
I generally try to do that, however sometimes find that I have to "leave it for someone else" when there's a pile of unmerged items with conflicts I'm ignorant to resolving. There would be less of this if the above were the rule. It also helps when things get messy. Recently I worked with a member who created a PR against master that applied to 2.9. I tried unsuccessfully to get them to make the PR against 2.9 instead so I could merge it upstream. In an effort to not discourage collaboration, and after talking with Andy offline, I ended up recreating it in 2.9 on their behalf. There was a pile of unmerged commits at the time, so I didn't clean up after myself. I am also by no means a git expert, so I'm alway open to learn/correct anything I'm doing incorrectly. Happy New Year all! -Greg On Sun, Dec 31, 2023 at 7:14 AM Hans Unzner <hansunz...@gmail.com> wrote: > > > Am 31.12.23 um 13:01 schrieb andy pugh: > > On Sun, 31 Dec 2023 at 11:50, Hans Unzner <hansunz...@gmail.com> wrote: > > > >>> Is it the job of the person who accepts the PR to merge it upstream? > >>> Or a secondary task for the Pull Requestor? > >>> > >> I think it would be the best if the person who accepts the PR or the > >> persons who makes changes which could cause conflicts merge the branch > >> upwards. > > Yes, so do I. I was asking which it should be. > > > > Maybe PRs to 2.9 (and earlier) should also be presented with a > > merge-PR to upstream branches? > You mean via Github by the author of the PR? Not sure if that will work. > Better that the person who merges it keep track of it. > > > _______________________________________________ > Emc-developers mailing list > Emc-developers@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/emc-developers > _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
