Closed
Conversation
Contributor
Author
|
Ah, it appears as though I had commits from other contributors from the upstream included. I'm not quite sure how to deal with those at the moment. |
9abbf92 to
f0712dc
Compare
Contributor
Author
|
I think what I had tried to do made it much messier with all of the items in Files Changed from the soft reset of commits. |
bbebb16 to
e3b45ec
Compare
story645
requested changes
Nov 23, 2020
e56b3fb to
b4c4ae0
Compare
QuLogic
reviewed
Dec 3, 2020
cc756c3 to
91ee54a
Compare
Contributor
Author
|
Ugh, I knew I messed up again... I couldn't remember how to rebase properly with my original local branch and now it's back to the messed up problem I had before. I apologize for dropping the ball on this PR. |
Member
|
Is alright, git is a massive pain. Ping on gitter as needed! |
Member
|
Until you know what you are doing, always back your branch up before doing a rebase. Then you can repeat until you get it right. |
91ee54a to
0520035
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR Summary
PR Checklist
pytestpasses).flake8on changed files to check).flake8-docstringsand runflake8 --docstring-convention=all).doc/users/next_whats_new/(follow instructions in README.rst there).doc/api/next_api_changes/(follow instructions in README.rst there).