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 package template #759

Merged
merged 4 commits into from
Sep 10, 2024
Merged

Conversation

Cadair
Copy link
Member

@Cadair Cadair commented Sep 10, 2024

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

@Cadair Cadair added this to the 2.3.0 milestone Sep 10, 2024
@Cadair Cadair added the backport 2.2 on-merge: backport to 2.2 label Sep 10, 2024
@Cadair Cadair mentioned this pull request Sep 10, 2024
@nabobalis
Copy link
Contributor

Repr values have changed.

@nabobalis nabobalis merged commit 00e4a6b into sunpy:main Sep 10, 2024
13 of 15 checks passed
Copy link

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

"Backport PR #759 on branch 2.2 (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.

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.

3 participants