Fb alphorn #73
Open
Fb alphorn #73
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
|
C'est à vous de résoudre le conflit sur votre branche. Est-ce que vous avez mergé mon master sur votre fb-alphorn? |
|
je n'ai pas eu de conflit sur ma branche. par contre je n'ai pas mergé ma
branche fb-alphorn avec la votre
2018-03-01 18:24 GMT+01:00 Olivier Liechti <[email protected]>:
… C'est à vous de résoudre le conflit sur votre branche. Est-ce que vous
avez mergé mon master sur votre fb-alphorn?
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#73 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/Ab0EgGxk7jN3OoznfbVq-SdjbEYqd1DDks5taC6KgaJpZM4SYqCy>
.
|
|
C'est justement en mergeant ma branche sur votre fb- que vous allez avoir des conflits. Vous devez les résoudre en acceptant ma version des fichiers. Ce qui veut dire qu'en faisant la PR, il n'y aura plus de conflit. |
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.
Injoy music with my instrument