Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: Add workflow diagram to working_with_remotes.md assignment. #29446

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

AndresDev28
Copy link

Because

This pull request adds a workflow diagram to the "Working with Remotes" assignment in the Intermediate Git course. The diagram visually represents the Git and GitHub collaboration workflow, making it easier for students to understand the steps involved in contributing to open-source projects. This enhancement aims to improve the clarity and educational value of the assignment.

This PR

  • Adds a new "Workflow Diagram" section to the working_with_remotes.md assignment, placed after the "Lesson Overview" section.
  • Includes a Mermaid diagram within the new section, illustrating the flow of changes between local, origin, and upstream repositories during a typical GitHub contribution workflow. Also including the Pull Request and Merge steps on GitHub.

Issue

Closes #XXXXX

This PR does not close any specific issue. It is an enhancement to the learning material as part of a course assignment.

Additional Information

There was no prior Discord discussion for this enhancement.

Pull Request Requirements

  • I have thoroughly read and understand The Odin Project curriculum contributing guide
  • The title of this PR follows the location of change: brief description of change format, e.g. Intro to HTML and CSS lesson: Fix link text
  • The Because section summarizes the reason for this PR
  • The This PR section has a bullet point list describing the changes in this PR
  • If this PR addresses an open issue, it is linked in the Issue section
  • If any lesson files are included in this PR, they have been previewed with the Markdown preview tool to ensure it is formatted correctly
  • If any lesson files are included in this PR, they follow the Layout Style Guide

@github-actions github-actions bot added the Content: Git Involves Git content label Feb 21, 2025
Copy link
Contributor

@JoshDevHub JoshDevHub left a comment

Choose a reason for hiding this comment

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

I think this is a cool idea @AndresDev28, but there's one problem: your diagram doesn't render! See the comments below for how to fix it.

Comment on lines 18 to 26
```mermaid
graph TD;
A[Upstream Repository: TheOdinProject/curriculum] -->|git fetch upstream/main| B[Local Repository: main];
B -->|git checkout your_branch_name| C[Local Repository: your_branch_name];
C -->|git push origin your_branch_name| D[Your Fork on GitHub];
D -->|Create Pull Request to Upstream| E[Pull Request on GitHub];
E -->|Maintainers Merge PR to Upstream| A[Upstream Repository: TheOdinProject/curriculum];
```
Copy link
Contributor

Choose a reason for hiding this comment

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

This diagram doesn't render on the site properly. You can check that anything you're introducing renders properly by using our markdown preview tool.

To see the correct syntax for mermaid diagrams, look at the mermaid section of our LAYOUT_STYLE_GUIDE. This should get it to display properly.

Copy link
Author

Choose a reason for hiding this comment

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

@JoshDevHub Thanks for pointing that out! I've reviewed the Mermaid section of the LAYOUT_STYLE_GUIDE and used the Markdown preview tool. I've wrapped the Mermaid diagram code in

 tags in working_with_remotes.md and pushed the updated version. The diagram now renders correctly in the preview tool. Could you please take another look?

Copy link
Contributor

@JoshDevHub JoshDevHub left a comment

Choose a reason for hiding this comment

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

Awesome. Just a couple more small changes to pass the linter. HTML tags need to be surrounded on both sides by empty lines.


Here is a visual representation of the workflow with Git and GitHub and illustrates how changes flow between repositories during collaboration.

<pre class="mermaid">
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
<pre class="mermaid">
<pre class="mermaid">

C -->|git push origin your_branch_name| D[Your Fork on GitHub];
D -->|Create Pull Request to Upstream| E[Pull Request on GitHub];
E -->|Maintainers Merge PR to Upstream| A[Upstream Repository: TheOdinProject/curriculum];
</pre>
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
</pre>
</pre>

@@ -11,6 +11,21 @@ This section contains a general overview of topics that you will learn in this l
- Dangers of history-changing operations.
- Best practices of history-changing operations.

### Workflow Diagram
Copy link
Contributor

Choose a reason for hiding this comment

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

Heading needs to be sentence case

Suggested change
### Workflow Diagram
### Workflow diagram

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Content: Git Involves Git content
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants