Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates from the package template #804

Merged
merged 1 commit into from
Jan 13, 2025
Merged

Updates from the package template #804

merged 1 commit into from
Jan 13, 2025

Conversation

github-actions[bot]
Copy link

This is an autogenerated PR, which will applies the latest changes from the SunPy Package Template.
If this pull request has been opened as a draft there are conflicts which need fixing.

To run the CI on this pull request you will need to close it and reopen it.

@github-actions github-actions bot added the No Changelog Entry Needed Skip any changelog checks. label Jan 13, 2025
@Cadair Cadair added the backport 2.2 on-merge: backport to 2.2 label Jan 13, 2025
@Cadair Cadair added this to the 2.2.5 milestone Jan 13, 2025
@Cadair Cadair closed this Jan 13, 2025
@Cadair Cadair reopened this Jan 13, 2025
@Cadair Cadair merged commit 067ddf8 into main Jan 13, 2025
19 checks passed
@Cadair Cadair deleted the cruft/update branch January 13, 2025 09:58
Copy link

lumberbot-app bot commented Jan 13, 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.2
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 067ddf81a11ead2a82ac2df9bcb2cfcf36baa907
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #804: Updates from the package template'
  1. Push to a named branch:
git push YOURFORK 2.2:auto-backport-of-pr-804-on-2.2
  1. Create a PR against branch 2.2, I would have named this PR:

"Backport PR #804 on branch 2.2 (Updates from the 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 Jan 13, 2025
@Cadair Cadair removed Still Needs Manual Backport This PR needs manually backporting. backport 2.2 on-merge: backport to 2.2 labels Jan 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
No Changelog Entry Needed Skip any changelog checks.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant