Skip to content

Conversation

@Carreau
Copy link
Member

@Carreau Carreau commented Jul 20, 2022

No description provided.

@Carreau
Copy link
Member Author

Carreau commented Jul 20, 2022

@meeseeksdev backport to 1.x

@lumberbot-app
Copy link
Contributor

lumberbot-app bot commented Jul 20, 2022

Something went wrong ... Please have a look at my logs.

@Carreau
Copy link
Member Author

Carreau commented Jul 20, 2022

@meeseeksdev backport to 1.x

meeseeksmachine pushed a commit to meeseeksmachine/test1 that referenced this pull request Jul 20, 2022
@Carreau Carreau closed this Nov 29, 2023
@Carreau
Copy link
Member Author

Carreau commented Jul 29, 2024

@meeseeksdev backport to 1.x

@lumberbot-app
Copy link
Contributor

lumberbot-app bot commented Jul 29, 2024

Could not push to auto-backport-of-pr-85-on-1.x due to error, aborting.

@Carreau
Copy link
Member Author

Carreau commented Jul 29, 2024

@meeseeksdev backport to 2.x

@lumberbot-app
Copy link
Contributor

lumberbot-app bot commented Jul 29, 2024

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 2.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 bdf4793865dc3176b5e7ff1cb7b49625dd19e4ca
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #85: Update readme.md'
  1. Push to a named branch:
git push YOURFORK 2.x:auto-backport-of-pr-85-on-2.x
  1. Create a PR against branch 2.x, I would have named this PR:

"Backport PR #85 on branch 2.x (Update readme.md)"

And apply the correct labels and milestones.

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

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants