Git Hub Tutorial - Khoi Nguyen

[nguy5095]

Closes Git tutorial requirements

Notes

I have completed the Git tutorial using Sourcetree. This PR includes the creation of topic branches, a managed merge conflict in lipsum_insanity.txt, and restored that file to the develop state. I also updated users.txt with a new entry (Wonder Woman)

Self-Review

1. Are all files under 300 kB? Yes
2. Are all files named according to the appropriate naming convention? Yes
3. Do all Markdown files follow the CONTRIBUTING article template? Yes
4. Do all links work in the material that the PR is adding? Yes
5. Is the PR configured to close the correct issue(s)? Yes
6. Did the PR fully address the Approach section of the issue(s) it is closing? Yes

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:

• Report checklist
• Publication archive checklist (select a checklist from the Approach that corresponds to the step this PR seeks to complete).
• Standard checklist (if none of the above apply).

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.

[nguy5095]

@mohamed-dek1 could you review my PR for this Git Hub Tutorial?

[mohamed-dek1]

@nguy5095, looks like you might've forgotten to restore the original version of the lipsum_insanity file. This would've happened in step 21 of the tutorial. Can you take a look at it again?

Step 21

[nguy5095]

@mohamed-dek1 Could you check again? I just restored the lipsum_insanity file. I'm a little unsure if I did it correctly.

[mohamed-dek1]

@nguy5095, did you push your changes after restoring the file? It doesn't look like any commits were pushed since the comment I made.

[nguy5095]

@mohamed-dek1 I just pushed the "make_merge_conf" folder with the changes.

[mohamed-dek1]

@nguy5095, I'm not sure why it didn't update but maybe try removing this file and pushing one more time

[nguy5095]

@mohamed-dek1 I removed that file and pushed again

[mohamed-dek1]

Thank you @nguy5095, looks good to me! @elsevers, can you review this?