Don't Panic #651
Merged
Don't Panic #651
Conversation
This file contains 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
… which has already been despawned.
|
Weird, I wonder why the first two commits show up again even though they've already been merged into master in #649? Maybe it's because I re-used the same branch? |
|
Hmm. After resolving the changelog merge conflict the diff part from the first two commits disappeared. At least that's sane. |
|
yeah i think its because the squash resulted in a new commit, which means you're adding "new" commits to the history. |
|
In this case its harmless because I'm going to squash this pr too :) |
|
Ah, squash-n-merges, that makes sense. |
karroffel
added
C-Code-Quality
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Same as #649 for
despawn_recursivetoo.