Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

1. Checkout backport branch and update it.

$ git checkout v3.0.x
$ git pull

2. Cherry pick the first parent branch of the this PR on top of the older branch:

$ git cherry-pick -m1 79eb37aeb869bffcbe87640cb4fd3e646cd957f5

3. You will likely have some merge/cherry-pick conflict here, fix them and commit:

$ git commit -am 'Backport PR #14260: Remove old OSX FAQ page'

4. Push to a named branch :

git push YOURFORK v3.0.x:auto-backport-of-pr-14260-on-v3.0.x

5. Create a PR against branch v3.0.x, I would have named this PR:

"Backport PR #14260 on branch v3.0.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

1. Checkout backport branch and update it.

$ git checkout v3.0.3-doc
$ git pull

2. Cherry pick the first parent branch of the this PR on top of the older branch:

$ git cherry-pick -m1 79eb37aeb869bffcbe87640cb4fd3e646cd957f5

3. You will likely have some merge/cherry-pick conflict here, fix them and commit:

$ git commit -am 'Backport PR #14260: Remove old OSX FAQ page'

4. Push to a named branch :

git push YOURFORK v3.0.3-doc:auto-backport-of-pr-14260-on-v3.0.3-doc

5. Create a PR against branch v3.0.3-doc, I would have named this PR:

"Backport PR #14260 on branch v3.0.3-doc"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

The v3.0* branches will be deleted soon, so I see no reason to manually attempt to backport it.

This should not go back to 3.0.x anyway as the change for this landed in3.1