Skip to content

DOC: don't advocate deleting main branch - #25948

Merged
rcomer merged 1 commit into
matplotlib:mainfrom
rcomer:dont-delete-main
May 22, 2023
Merged

rcomer merged 1 commit into
matplotlib:mainfrom
rcomer:dont-delete-main

Conversation

@rcomer

@rcomer rcomer commented May 22, 2023

Copy link
Copy Markdown
Member

PR summary

There seems to be consensus at #25857 that the advice to delete your main branch is no longer helpful. I am not attempting to address the ensuing discussion in that issue(!) so am not linking it here.

PR checklist

@rcomer rcomer added this to the v3.7-doc milestone May 22, 2023
@story645

story645 commented May 22, 2023 •

Copy link
Copy Markdown
Member

Can self merge after doc build passes

Eta also thanks for following up on this!

@rcomer
rcomer merged commit ef56ed5 into matplotlib:main May 22, 2023
@lumberbot-app

lumberbot-app Bot commented May 22, 2023

Copy link
Copy Markdown

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.7.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 ef56ed537f101b848ae09bd1acd1879b13c00cf5
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am "Backport PR #25948: DOC: don't advocate deleting main branch"
  1. Push to a named branch:
git push YOURFORK v3.7.x:auto-backport-of-pr-25948-on-v3.7.x
  1. Create a PR against branch v3.7.x, I would have named this PR:

"Backport PR #25948 on branch v3.7.x (DOC: don't advocate deleting main branch)"

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.

@lumberbot-app

lumberbot-app Bot commented May 22, 2023

Copy link
Copy Markdown

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.7.1-doc
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 ef56ed537f101b848ae09bd1acd1879b13c00cf5
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am "Backport PR #25948: DOC: don't advocate deleting main branch"
  1. Push to a named branch:
git push YOURFORK v3.7.1-doc:auto-backport-of-pr-25948-on-v3.7.1-doc
  1. Create a PR against branch v3.7.1-doc, I would have named this PR:

"Backport PR #25948 on branch v3.7.1-doc (DOC: don't advocate deleting main branch)"

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.

@rcomer
rcomer deleted the dont-delete-main branch May 22, 2023 16:49
@rcomer rcomer modified the milestones: v3.7-doc, v3.8.0 May 22, 2023
@rcomer

rcomer commented May 22, 2023

Copy link
Copy Markdown
Member Author

I'm insufficiently motivated to manually backport...

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