Was this reversion intentional?#249
Merged
Martí Climent (marticliment) merged 3 commits intoDevolutions:mainfrom Oct 14, 2022
Merged
Was this reversion intentional?#249Martí Climent (marticliment) merged 3 commits intoDevolutions:mainfrom
Martí Climent (marticliment) merged 3 commits intoDevolutions:mainfrom
Conversation
Collaborator
|
No, this reversion was not intentional... I guess I messed up when fixing conflicts |
Contributor
Author
No problem, I guess I should make pull requests more organized, like all commits at once to avoid conflicts or it doesn't matter? |
Martí Climent (marticliment)
approved these changes
Oct 14, 2022
Collaborator
In here this pr made sense, there was just lots of conflicts, and the github web conflict resolver is kind of 💩, so it made me nervois and finished by messing this up |
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
2 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.
Martí Climent from the multiverse (@martinet101), I believe today you accidentally overwrote this change. By the way, is there any mistake in my code?
Change this
Into this
