Skip to content

Harley tutorial#119

Open
AwesomeTornado wants to merge 6 commits into
developfrom
Harley-Tutorial
Open

Harley tutorial#119
AwesomeTornado wants to merge 6 commits into
developfrom
Harley-Tutorial

Conversation

@AwesomeTornado
Copy link
Copy Markdown

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

1. Are all files under 300 kB (if not, please carefully assess whether it is worth committing them)? **Yes or No**
2. Are all files named according to the appropriate [naming convention](https://github.com/Severson-Group/research-repo-template?tab=readme-ov-file#file-naming), i.e., dash-case, camelCase, snake case? **Yes or No**
3. Do all Markdown files follow the [CONTRIBUTING article template](https://github.com/Severson-Group/.github/blob/main/CONTRIBUTING.md#markdown-documentation-template)? **Yes or No**
4. Do all links work in the material that the PR is adding? **Yes or No**
5. Is the PR configured to close the correct issue(s)? **Yes or No**
6. Did the PR fully address the `Approach` section of the issue(s) it is closing? **Yes or No**

Please work on addressing any **No** items.

@AwesomeTornado AwesomeTornado requested a review from elsevers as a code owner May 12, 2026 16:37
Copy link
Copy Markdown
Contributor

@elsevers elsevers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AwesomeTornado, super close! Just one snafu in the commit history:

Commit 2c380fb isn't resolving the merge conflict as this instruction asks:

  1. 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.
Image

E.g., compare it to ae48f89.

You have two options here:

  1. Either force your branches back to these commits and redo this merge
  2. 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)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants