@owendelong The fork is based on branch F31 while you're trying to merge to master - that's not what we want to do, there are release-specific differences between each branch (as you can see by the list of changes in this PR). You'll need to:

• Close this PR - unfortunately you can't change the target branch after the PR is created, so this one won't be of any use.
• Open a new one, and make sure you're merging from your fork's branch f31 to the upstream's branch f31. Ideally, run git pull --rebase on your local branch f31 first to make sure it's up to date.
• This commit should also go to branch master; that way it'll make its way to subsequent releases (new release branches are always created off of master). If you want, you can cherry pick the same commit to your local master (git cherry-pick -1 <hash>, where <hash> is the commit hash), push it to your fork, and then create another PR from there, this time from your fork's master to upstream master. Again, run git pull --rebase first to make sure your fork is up to date.

If you don't do the last step, I'll just cherry-pick it myself.

I=E2=80=99ll tell you what=E2=80=A6 The docs are wrong. I hope someone =
will choose to fix them.

I=E2=80=99ve pointed out the error.

I=E2=80=99ve jumped through a lot of hoops to try and fix the error.

I=E2=80=99m not jumping through more.

Owen

On Feb 6, 2020, at 04:27 , Petr Bokoc pagure@pagure.io wrote:
=20
=20
pbokoc commented on the pull-request: Fix the RFC number for DHCP = Architecture Option that you are following:
@owendelong The fork is based on branch F31 while you're trying to = merge to master - that's not what we want to do, there are = release-specific differences between each branch (as you can see by the = list of changes in this PR). You'll need to: =20 * Close this PR - unfortunately you can't change the target branch = after the PR is created, so this one won't be of any use. * Open a new one, and make sure you're merging from your fork's branch = `f31` to the upstream's branch `f31`. Ideally, run `git pull --rebase` = on your local branch `f31` first to make sure it's up to date. * This commit should also go to branch `master`; that way it'll make = its way to subsequent releases (new release branches are always created = off of `master`). If you want, you can cherry pick the same commit to = your local `master` (`git cherry-pick -1 <hash>`, where `<hash>` is the = commit hash), push it to your fork, and then create another PR from = there, this time from your fork's `master` to upstream `master`. Again, = run `git pull --rebase` first to make sure your fork is up to date. =20 If you don't do the last step, I'll just cherry-pick it myself.
=20
To reply, visit the link below or just reply to this email
https://pagure.io/fedora-docs/install-guide/pull-request/40

Eh, oh well. Your commit has been merged outside the PR and should appear online in about an hour, and I'm closing this.