Traduction faq/library.po#1789
Merged
Merged
Conversation
jeanas
previously approved these changes
Dec 14, 2021
Contributor
Author
|
Je ne comprends pas d'où viennent les conflits signalés ? |
Collaborator
|
@Fipaddict Les conflits surviennent quand des personnes ont fait des corrections au même fichier entre-temps. Pour les résoudre, il faut faire Git fait alors la fusion des modifications concurrentes, et laisse des marqueurs aux endroits qui ont été changés en parallèle. Il faut éditer manuellement pour résoudre le conflit. En l'occurrence, Christophe s'en est chargé, merci à lui. J'ai relu à nouveau et tout me paraît bon, je merge. Merci ! |
jeanas
approved these changes
Dec 18, 2021
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
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.
closes #1788