Hi, On Sep 20, 2022, 17:26 +0800, Justin Pryzby <pry...@telsasoft.com>, wrote: > On Tue, Sep 20, 2022 at 03:37:47PM +0800, Zhang Mingli wrote: > > I want to have a look at these patches, but apply on master failed: > > Yeah, it's likely to break every week or more often. > > You have a few options: > > 0) resolve the conflict yourself; > > 1) apply the patch to the commit that the authors sent it against, or > some commit before the conflicting file(s) were changed in master. Like > maybe "git checkout -b 64bitxids f66d997fd". > > 2) Use the last patch that cfbot successfully created. You can read the > patch on github's web interface, or add cfbot's user as a remote to use > the patch locally for review and/or compilation. Something like "git > remote add cfbot https://github.com/postgresql-cfbot/postgresql; git > fetch cfbot commitfest/39/3594; git checkout -b 64bitxids > cfbot/commitfest/39/3594". (Unfortunately, cfbot currently squishes the > patch series into a single commit and loses the commit message). > > You could also check the git link in the commitfest, to see if the > author has already rebased it, but haven't yet mailed the rebased patch > to the list. In this case, that's not true, but you could probably use > the author's branch on github, too. > https://commitfest.postgresql.org/39/3594/ > > -- > Justin Got it, thanks.
Regards, Zhang Mingli
