-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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
Small typo #12775
Small typo #12775
Conversation
I'm probably missing something, but I don't understand why the build failed after changing one word. |
Seems like it passed just now (there can be spurious failures on the test bots at times). Can you squash your commits? |
Sorry, I'm new to Git and couldn't figure how to squash my commit after reading the stack overflow question. I'll go read about git at git-scm.com and submit actual bugs later. I've deleted my repo. Again, sorry. |
I think this should do it: git reset 7870163 # reset to the first commit
git add --all # track all objects
git commit --amend # add them to the current commit The stackoverflow solution doesn't work because you didn't create a separate branch to push your changes. However, I suspect this would work: git rebase -i HEAD^ # `HEAD^` is the commit before the latest one |
Closing temporarily, I think this PR is confusing bors. |
Could you reopen with a new PR? This was apparently confusing bors sadly. |
That's really weird. Has it been investigated already? It has happened in the past. Is bors stalled? |
fix: Improve syntax fixup a bit, handle incomplete `if` - allow appending tokens after a token, not just a node - allow inserting delimiters (and remove them again) - fix up `if {}` and `if` without anything following
… r=xFrednet Handle single chars with `to_string()` for `single_char_add_str` Add support for single chars / literals with `to_string()` call for `push_str()` and `insert_str()`. changelog: [`single_char_add_str`]: handle single chars with `to_string()` call Closes rust-lang#12775
Just a small typo I felt like fixing.