Harley tutorial#119
Open
AwesomeTornado wants to merge 6 commits into
Open
Conversation
elsevers
requested changes
May 14, 2026
Contributor
elsevers
left a comment
There was a problem hiding this comment.
@AwesomeTornado, super close! Just one snafu in the commit history:
Commit 2c380fb isn't resolving the merge conflict as this instruction asks:
- Use your external merge tool to make the final lipsum_insanity.txt file have the text you added in step 13 (disregard your changes from make_merge_conf). Save lipsum_insanity.txt and exit the merge tool. Your merge conflict is resolved when you have committed your changes into Git. At any point before you commit, you can restart your merge by issuing git reset --hard HEAD. Caution: This will throw away uncommitted changes on your working copy! If you issue this command, you will be restored to step 15.
E.g., compare it to ae48f89.
You have two options here:
- Either force your branches back to these commits and redo this merge
- Scrap the tutorial and start over
(I am super picky on merging people's tutorials in because they become the example for the next person who does the tutorial)
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.
Addresses step 26 and 27.
Notes
Added Legoshi to users.
Self-Review
No significant breaking changes.
Reviewer Instructions
Reviewers, please copy and paste a suitable review checklist into your review and answer all questions.
Appendix
This section should be the same for all PRs. Do not edit this section when creating a PR.
Review Checklists
Checklists maintained by the eLev lab for research repositories include:
Standard checklist