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

Prepare 1.9.8, stop ignoring citation errors #2831

Merged
merged 1 commit into from
Jan 26, 2024
Merged

Conversation

flying-sheep
Copy link
Member

@flying-sheep flying-sheep commented Jan 26, 2024

  • Closes N/A
  • Tests included or not required because:
  • Release notes not necessary because:

@flying-sheep flying-sheep added this to the 1.9.8 milestone Jan 26, 2024
@flying-sheep flying-sheep changed the title Prepare 1.9.8 Prepare 1.9.8, stop ignoring citation errors Jan 26, 2024
Copy link

codecov bot commented Jan 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (6314190) 72.72% compared to head (0d3f5e6) 72.72%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #2831   +/-   ##
=======================================
  Coverage   72.72%   72.72%           
=======================================
  Files         111      111           
  Lines       12383    12383           
=======================================
  Hits         9005     9005           
  Misses       3378     3378           

@flying-sheep flying-sheep merged commit bf5f27a into master Jan 26, 2024
17 of 19 checks passed
@flying-sheep flying-sheep deleted the prepare-1.9.8 branch January 26, 2024 11:58
Copy link

lumberbot-app bot commented Jan 26, 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 1.9.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 bf5f27aa9e968de6e73fc7abb46a89084ddf6880
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #2831: Prepare 1.9.8, stop ignoring citation errors'
  1. Push to a named branch:
git push YOURFORK 1.9.x:auto-backport-of-pr-2831-on-1.9.x
  1. Create a PR against branch 1.9.x, I would have named this PR:

"Backport PR #2831 on branch 1.9.x (Prepare 1.9.8, stop ignoring citation errors)"

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.

None yet

1 participant