Skip to content

Updates from package template#849

Merged
nabobalis merged 2 commits into
sunpy:mainfrom
Cadair:cruft-manual-update
Jun 11, 2025
Merged

Updates from package template#849
nabobalis merged 2 commits into
sunpy:mainfrom
Cadair:cruft-manual-update

Conversation

@Cadair
Copy link
Copy Markdown
Member

@Cadair Cadair commented Jun 11, 2025

This PR has been generated by a script, it should update the repo with the latest changes from the package template.

@nabobalis nabobalis added this to the 2.4.0 milestone Jun 11, 2025
@nabobalis nabobalis added backport 2.3 on-merge: backport to 2.3 No Changelog Entry Needed Skip all changelog checks. labels Jun 11, 2025
@nabobalis nabobalis merged commit d142af0 into sunpy:main Jun 11, 2025
20 checks passed
@lumberbot-app
Copy link
Copy Markdown

lumberbot-app Bot commented Jun 11, 2025

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 d142af05c14266a9048bb4a2f4d813027a9ada80
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #849: Updates from package template'
  1. Push to a named branch:
git push YOURFORK 2.3:auto-backport-of-pr-849-on-2.3
  1. Create a PR against branch 2.3, I would have named this PR:

"Backport PR #849 on branch 2.3 (Updates from package template)"

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 Jun 11, 2025
nabobalis added a commit that referenced this pull request Jun 12, 2025
@nabobalis nabobalis removed the Still Needs Manual Backport This PR needs manually backporting. label Jun 12, 2025
@Cadair Cadair deleted the cruft-manual-update branch October 7, 2025 08:44
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 No Changelog Entry Needed Skip all changelog checks.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants