Skip to content

docs: Restructure Git & GitHub 101 into phases - #1672

Merged
adiati98 merged 3 commits into
Virtual-Coffee:mainfrom
adiati98:docs/git-101-restructure
Oct 10, 2026
Merged

adiati98 merged 3 commits into
Virtual-Coffee:mainfrom
adiati98:docs/git-101-restructure

Conversation

@adiati98

@adiati98 adiati98 commented Oct 9, 2026

Copy link
Copy Markdown
Member

Linked Issue

Closes #1671

Description

This PR restructures the Git & GitHub 101 page into four phases. It does not add new content.

  • Replaces the heading "Contributing to Open Source with Git and GitHub" with four phase headings. Each phase holds its existing sections:
    • "Setting Up": Forking a Repository, Authenticating with GitHub, Cloning a Repository, Adding an upstream Remote Repository
    • "Making a Change": Creating a New Branch, Adding and Committing Changes
    • "Sending Your Change": Pushing Changes, Making a Pull Request
    • "Keeping Your Fork Up to Date": Syncing Your Fork with upstream, Synchronizing Changes Locally, Resolving Merge Conflicts
  • Moves the sync and merge conflict sections after the pull request.
  • Marks "Advanced Git and GitHub Workflows" and "Getting the Most Out of Your GitHub Profile" as optional.
  • Updates the sentences that depended on the old order, and links to "Keeping Your Fork Up to Date" from "Making a Pull Request".

Methodology

Code of Conduct

By submitting this pull request, you agree to follow our Code of Conduct

Replace the single "Contributing to Open Source with Git and GitHub" section with four phases: Setting Up, Making a Change, Sending Your Change, and Keeping Your Fork Up to Date. Move syncing and merge conflicts after the pull request, and mark the advanced and profile sections as optional.
@adiati98
adiati98 requested review from a team as code owners October 9, 2026 12:33
@adiati98 adiati98 added the content Content additions or updates label Oct 9, 2026
@netlify

netlify Bot commented Oct 9, 2026 •

Copy link
Copy Markdown

✅ Deploy Preview for virtual-coffee-io ready!

Built without sensitive environment variables

Name Link
🔨 Latest commit 769a6ae
🔍 Latest deploy log https://app.netlify.com/projects/virtual-coffee-io/deploys/6ac8e62377979b000832e2fd
😎 Deploy Preview https://deploy-preview-1672--virtual-coffee-io.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.
Lighthouse
Lighthouse
1 paths audited
Performance: 65 (🔴 down 17 from production)
Accessibility: 100 (no change from production)
Best Practices: 92 (🔴 down 8 from production)
SEO: 92 (🔴 down 8 from production)
PWA: -
View the detailed breakdown and full score reports
🤖 Make changes Run an agent on this branch

To edit notification comments on pull requests, go to your Netlify project configuration.

@greptile-apps

greptile-apps Bot commented Oct 9, 2026 •

Copy link
Copy Markdown

RetriggerConfidence Score: 5/5

[Low impact] This PR appears safe to merge.

Summary

Reorganizes the Git and GitHub guide into four phases and marks the advanced workflows and profile sections as optional.

  • Moves fork syncing and conflict resolution after the pull request steps.
  • The latest change clarifies the final push instruction without changing its link.
  • The previous unnumbered finding is fully addressed: readers are now told to push after fixing conflicts locally.

Reviews (3) · Last reviewed commit: "docs: fix formatting of push step" · Reviewed by Greptile

Comment thread src/content/resources/developer-resources/open-source/git-101.mdx
The conflict steps now come after the pull request, so a reader who resolves conflicts locally must push the branch to update the pull request.
@adiati98
adiati98 merged commit d023d41 into Virtual-Coffee:main Oct 10, 2026
13 checks passed
@adiati98
adiati98 deleted the docs/git-101-restructure branch October 10, 2026 19:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

content Content additions or updates

Projects

None yet

Development

Successfully merging this pull request may close these issues.

docs: Restructure Git & GitHub 101 for beginners

2 participants