如何在GitHub上搭建与上游仓库或他人项目对齐的自有项目？

Hey there! Let me walk you through how to set up your own project on GitHub while keeping it aligned with an upstream repository or another user's project. I’ve done this countless times for my own forks and collaborative projects, so I’ll share the practical, no-fluff steps that actually work.

First, decide if your project is a fork of an existing upstream repo or a new project that needs to stay aligned with another repo:

• Fork the upstream repo (if building on an existing project)：Head to the upstream repo’s GitHub page, click the "Fork" button in the top-right corner. This creates a copy of the repo under your GitHub account.
• Clone your repo locally：Grab the clone URL from your repo’s page, then run:

  git clone https://github.com/your-username/your-repo-name.git
  cd your-repo-name
  

• For a brand-new project that needs alignment：Create an empty repo on GitHub first, clone it locally, then follow the next step to link the upstream repo.

You need to tell Git where the original/upstream repo lives so you can pull updates from it:

• Add the upstream remote:

  git remote add upstream https://github.com/upstream-username/upstream-repo-name.git
  

• Verify the remote was added successfully:

  git remote -v
  

  You should see two entries: origin (your repo) and upstream (the original repo).

This is the core part to stay aligned. I make it a habit to do this before starting any new work to avoid messy conflicts:

• Switch to your main branch (usually main or master):

  git checkout main
  

• Fetch the latest changes from upstream (this doesn’t modify your local files yet):

  git fetch upstream
  

• Merge the upstream changes into your local main branch:

  git merge upstream/main
  

  If there are conflicts (Git will tell you), open the conflicting files—look for <<<<<<<, =======, and >>>>>>> markers. Edit the file to keep the correct code, then run git add . followed by git commit -m "Resolve merge conflicts with upstream".
• Push the updated main branch to your GitHub repo:

  git push origin main
  

Never develop directly on your main branch—use feature branches instead. This keeps your main branch clean and easy to sync with upstream:

• Create a new feature branch:

  git checkout -b feature/my-awesome-feature
  

• Work on your feature, commit changes as you go:

  git add .
  git commit -m "Add initial version of awesome feature"
  

• Push the feature branch to your GitHub repo:

  git push origin feature/my-awesome-feature
  

• If upstream updates while you’re working, sync your main branch first, then merge those updates into your feature branch:

  git checkout main
  git fetch upstream && git merge upstream/main
  git checkout feature/my-awesome-feature
  git merge main
  

  Resolve any conflicts here too, then push the updated feature branch.

If you want to share your work with the original project, you can open a Pull Request (PR):

• Make sure your feature branch is synced with the latest upstream code (follow step 4 above).
• Go to your repo’s GitHub page, switch to your feature branch, click "Compare & pull request".
• Fill in a clear description of what your feature does, then submit the PR. The upstream maintainers will review it and merge it if it fits.

• Sync regularly: I sync upstream at least once a week, or before starting a new feature—smaller syncs mean fewer conflicts to fix.
• Use rebase for cleaner history (carefully!): If you prefer a linear commit history, you can replace git merge upstream/main with git rebase upstream/main. But never rebase a branch that other people are working on—it rewrites commit history and can cause chaos.
• Check upstream issues: Before starting work, look at the upstream repo’s issues and PRs to avoid duplicating work or building something that’s already in progress.

内容的提问来源于stack exchange，提问作者JC.wang