Closed gybrish closed 1 year ago
Not sure why the commits for the rust fmt workflow are included in this, let me know if I can fix it up somehow.
It looks like you merged rather than fast forwarded: https://code-maven.com/enforce-fast-forward-as-merge-strategy
I suspect you ran into issues because I recently changed the master
branch to main
, so you will probably need to change it locally a well. You can then pull the latest changes and rebase your work.
You could also fetch the latest changes, and then reset --hard to main
when you are in your clippy_fixes
branch and then git cherry-pick cf5aa9e
since your work is a single commit.
Looks like it's difficult to sync the fork after the branch name change - will resubmit a new PR.
Fixing up clippy warnings/errors before we look to address #287