Closed coder2000 closed 3 months ago
All modified and coverable lines are covered by tests :white_check_mark:
Project coverage is 89.29%. Comparing base (
62762b6
) to head (c0386b5
).
:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.
I tried to merge them but it just added more commits. You can squash as part of the merge when closing the PR iirc.
I tried to merge them but it just added more commits.
In this situation I would recommend git rebase -i
or git reset
.
git rebase -i <hash_of_first_commit>
will allow you to edit the git history manually, wherein you can squash all previous commits into one and git will prompt you for the commit message.
git reset <hash_of_first_commit>
will place your HEAD at the start of where you were working with all your edited files already for you to git add
, and then commit all the changes together with one commit.
Both of these methods will mean that your remote branch and local branch will have conflicts and you will have to git push --force
to push local to remote.
If git
is giving you trouble still, feel free to reach out to me on discord: @ell.nix.
You can squash as part of the merge when closing the PR iirc.
Unfortunately, I don't have write access to the repository, I am supposed to use the bors
bot.
Build failed:
bors merge
Fix the each_result method for multi search requests to pass a block to the each method.