如何向多个fork推送代码变更且不破坏自定义内容？

Absolutely feasible—this is exactly the kind of workflow Git was built for! Let’s break down how to safely sync those upstream bug fixes into each customer’s fork without wiping out their custom tweaks:

Step 1: Double-Check Your Upstream Remote #

You mentioned you already set the original repo as the remote for all forks, but just to confirm, for each local copy of a customer’s fork, verify the upstream is correctly linked:

# List all remotes to confirm upstream exists
git remote -v
# If it's missing, add it (replace <original-repo-url> with your actual repo URL)
git remote add upstream <original-repo-url>

Step 2: Fetch Upstream Changes (No Merging Yet) #

First, pull in the latest bug fix from the original repo without touching your customer’s custom branch:

git fetch upstream

This grabs the upstream updates and stores them locally, so you can work with them safely without disrupting the customer’s code.

Step 3: Rebase Customer Customizations on Top of Upstream #

This is the magic step. Rebasing will replay your customer’s custom commits after the upstream bug fix, effectively stacking their changes on top of the updated base code.

Important: Only use rebase if the customer’s fork is private and no one else is pushing to it (which sounds like your case). If the customer is actively working on their fork, skip to the merge alternative below.

# Switch to the customer's custom branch (e.g., customer-acme-main)
git checkout customer-acme-main
# Rebase onto the upstream's main branch (replace "main" with your upstream's default branch if needed)
git rebase upstream/main

Handling Conflicts #

Git might flag conflicts if the bug fix overlaps with the customer’s custom code. This is normal—here’s how to fix it:

• Open the conflicting files and edit them to keep the customer’s customizations where they matter, while applying the upstream bug fix logic.
• Once resolved, mark the file as fixed:

  git add <conflicting-file-name>
  

• Continue the rebase:

  git rebase --continue
  

• If you need to abort for any reason, run git rebase --abort to roll back to your original branch state.

Step 4: Push the Updated Branch to the Customer’s Fork #

Since rebasing rewrites commit history, you’ll need to force push—but use the safer --force-with-lease option to avoid overwriting unexpected changes:

git push origin customer-acme-main --force-with-lease

This will only push if the remote branch matches what you had locally, preventing accidental overwrites if someone else pushed to the fork without your knowledge.

Alternative: Merge Instead of Rebase (For Shared Forks) #

If the customer is actively collaborating on their fork and you don’t want to rewrite history, use a merge instead:

git checkout customer-acme-main
git merge upstream/main

This creates a new merge commit that combines the upstream bug fix with the customer’s customizations. Resolve any conflicts the same way as above, then push normally:

git push origin customer-acme-main

Pro Tip: Automate for Multiple Forks #

If you have dozens of customer forks, save time by writing a simple shell script to loop through each local repo, run the fetch/rebase/push steps. Just make sure to test it on one fork first to avoid mishaps!

内容的提问来源于stack exchange，提问作者Surge Mistyuk