remove the requirement to sort the dict file.#360
Merged
Merged
Conversation
… in lot of PRs. And adding a check for duplicated entries
raulcd
approved these changes
May 24, 2020
Collaborator
|
Qué bueno!!! |
Collaborator
|
Está bueno esto. Aunque tengo unas preguntas: No entiendo porqué no habría conflictos si todos agregan palabras al final, cuando intente hacer merge va a notar que ambos modificaron la última línea y habrá conflicto igualmente, no? Por otro lado, quizás no es buena idea hacer que el build falle por palabras duplicadas y bloquee el PR, ya que igualmente son ignoradas. ¿Que opinás? |
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
3 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.
Debido a que hemos sort del archivo del diccionario con el pre-commit esto esta creando un montón de conflictos a la hora de hacer merge de un nuevo PR.
Sí unicamente agregamos palabras nuevas al final del archivo esos conflictos van a producirse muy pocas veces.