📁 Files
No files yet. Create one!
! ConflictS StagedM ModifiedU Untracked
No files staged. Use
git add to stage changes.📊 Commit Graphcurrent branchmain
GitorGit%20rotate(-45%2029%2029)'%20d='M5,58c-2.76142,0%20-5,-2.23858%20-5,-5v-48c0,-2.76142%202.23858,-5%205,-5h33v12.54404c-2.06553,0.94801%20-3.5,3.03446%20-3.5,5.45596c0,0.73514%200.13221,1.43941%200.37415,2.09031l-15.28384,15.28384c-0.6509,-0.24194%20-1.35517,-0.37415%20-2.09031,-0.37415c-3.31371,0%20-6,2.68629%20-6,6c0,3.31371%202.68629,6%206,6c3.31371,0%206,-2.68629%206,-6c0,-0.73514%20-0.13221,-1.43941%20-0.37415,-2.09031l14.87415,-14.87415l0,11.50851c-2.06553,0.94801%20-3.5,3.03446%20-3.5,5.45596c0,3.31371%202.68629,6%206,6c3.31371,0%206,-2.68629%206,-6c0,-2.42149%20-1.43447,-4.50795%20-3.5,-5.45596l0,-12.08808c2.06553,-0.94801%203.5,-3.03446%203.5,-5.45596c0,-2.42149%20-1.43447,-4.50795%20-3.5,-5.45596l0,-12.54404h10c2.76142,0%205,2.23858%205,5v48c0,2.76142%20-2.23858,5%20-5,5z'/%3e%3c/svg%3e)
🫂 Open Source ContributionAdvanced0/6
📖 Concepts
Fork & CloneFork the upstream repository on GitHub, then clone your fork locally. The upstream is added as a second remote so you can sync with the original project.
Feature BranchNever commit directly to main. Create a descriptive feature branch for your changes. This isolates your work and makes PR review easy.
Rebase onto UpstreamWhile you work, the upstream project may move forward. Rebase your feature branch onto the latest upstream/main to keep history linear and avoid merge conflicts in the PR.
Clean PRBefore opening a PR, squash your commits into one logical change with a descriptive message. Reviewers appreciate a clean, focused commit.
📖 Story
You want to contribute a bug fix to an open source project. You've forked the repo on GitHub and cloned your fork locally.
Meanwhile, the upstream project added a new feature (via fetch). Your task is to sync with upstream, create a feature branch, make your fix, rebase onto the latest upstream, squash your commits, and push a clean branch for your PR.
This is the standard open source contribution workflow used by millions of developers on GitHub, GitLab, and Bitbucket.
View the current state
Run
git log --oneline --all. Your fork's main (HEAD) has 2 commits. The upstream has 3 — it moved ahead with a version bump. You need to sync first.● View the current state
○ Fetch upstream changes
○ Create a feature branch for your fix
○ Apply your fix and commit
○ Rebase your feature branch onto upstream/main
○ Push your feature branch
🧩 The HotfixUnsolved
📖 Story
Production is throwing errors. You already fixed the bug two days ago while working on a feature — the fix is buried in commit
gggg2222 on feature/payments.
But feature/payments isn't ready to merge — it has half-finished work above the fix.
Cherry-pick just the fix commit onto main to unblock production, without bringing the unfinished work with it.Goal
Solve the problem by using the correct Git commands.
Terminal
🧩 Problem: The Hotfix
Production is down. A fix exists on your feature branch — get it onto main without merging the whole branch.
Use the terminal to solve the problem. Results are checked automatically.