This repository was archived by the owner on Mar 13, 2023. It is now read-only.
Clarify readme for merge conflict exercise #22
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
The instructions introduce an unnecessary third colour (#ff00ea) which makes the exercise more confusing. All that is needed to produce the merge conflict is: - branch off master `purple_links` - add change to link colour on this branch - return to master and change the same line - try to run `git merge` I worked through this exercise with a student today and this was what we ended up doing.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The instructions introduce an unnecessary third colour (#ff00ea) which
makes the exercise more confusing.
All that is needed to produce the merge conflict is:
purple_linksgit merge purple_linksI worked through this exercise with a student today and this was what
we ended up doing.