Skip to content

Conversation

@Cadair
Copy link
Member

@Cadair Cadair commented Jan 7, 2026

No description provided.

@Cadair Cadair added this to the 2.3.6 milestone Jan 7, 2026
@Cadair Cadair added backport 2.3 on-merge: backport to 2.3 backport 2.4 on-merge: backport to 2.4 No Changelog Entry Needed Skip all changelog checks. labels Jan 7, 2026
@Cadair Cadair merged commit cb53cff into sunpy:main Jan 7, 2026
20 of 22 checks passed
@lumberbot-app
Copy link

lumberbot-app bot commented Jan 7, 2026

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

"Backport PR #907 on branch 2.3 (Manual package template update)"

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 added the Still Needs Manual Backport This PR needs manually backporting. label Jan 7, 2026
meeseeksmachine pushed a commit to meeseeksmachine/ndcube that referenced this pull request Jan 7, 2026
@Cadair Cadair deleted the fix_cruft_update branch January 7, 2026 14:40
Cadair added a commit that referenced this pull request Jan 7, 2026
Co-authored-by: Stuart Mumford <stuart@cadair.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.3 on-merge: backport to 2.3 backport 2.4 on-merge: backport to 2.4 No Changelog Entry Needed Skip all changelog checks. Still Needs Manual Backport This PR needs manually backporting.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant