Open
Conversation
|
@EnzoxxB te recomiendo que revises cual es el problema que tenes y porqué no te deja hacer el merge, donde te genera el conflicto |
Contributor
Author
|
Directamente borré la rama de mi PC y subí los archivos manualmente a la Main, ya no recuerdo bien el conflicto pero si mal no recuerdo había algún problema con mi repositorio local cuando intentaba hacer el git push. Intenté actualizarlo con un pull pero no solucionaba el error, entonces para no rabiar lo hice así. @lokywolf2295 |
|
Está mal, pero no tan mal |
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.
.