Merge conflicts waaaaaaaah. #36
Closed
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
Pull updated student roster from TIY-Orlando/student-roster
update my master fork
PULL!...TheIronYard--Orlando/student-roster
Conflicts: * 2015-05/FEE/MStaehling.md
The iron yard orlando master
It's another pull! TIY-Orlando/student-roster
Attempting to resolve a merge conflict after editing in Terminal for practice.
Retrieving upstream changes from master. Bring on ze merge conflicts!
fixed a conflict in Terminal — MStaehling.md
Conflicts: 2015-05/FEE/Epicurean306.md 2015-05/FEE/JessyRiordan.md
…into pope410211-master Conflicts: 2015-05/FEE/Epicurean306.md 2015-05/FEE/JessyRiordan.md
30 tasks
Conflicts: 2015-05/FEE/kmattiko.md
GitHub Octocat!
Updating student-roster profiles
25 tasks
Conflicts: * 2015-05/FEE/Epicurean306.md * 2015-05/FEE/JessyRiordan.md * 2015-05/FEE/MStaehling.md * 2015-05/FEE/jorgehjr84.md * 2015-05/FEE/kmattiko.md * 2015-05/FEE/melrodbos.md * 2015-05/FEE/pcreglow.md * 2015-05/FEE/pope410211.md
Conflicts: 2015-05/FEE/Epicurean306.md 2015-05/FEE/JessyRiordan.md 2015-05/FEE/MStaehling.md 2015-05/FEE/gatorpazz.md 2015-05/FEE/kmattiko.md 2015-05/FEE/melrodbos.md 2015-05/FEE/pcreglow.md 2015-05/FEE/pope410211.md
66 tasks
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.
Fixed @pope410211 and his non-existing emoji references. Also @JessyRiordan and her tendency to answer everyone differently.