如何通过Git Rebase将已合并的修改整合到分支2？

Got it, let's walk through how to get those post-review changes from branch 1 into branch 2 based on your repo setup.

Just to recap your setup to make sure we're on the same page:

• master (branch 0) has the merged version of branch 1's finalized, post-review changes
• Branch 2 was created from branch 1 before those review updates were made, so it's missing those key fixes/modifications

Option 1: Merge branch 1 directly into branch 2 (if branch 1 still exists) #

If you haven't deleted branch 1 after merging it to master, this is the most direct approach:

• Switch to branch 2 first:

  git checkout branch2
  

• Fetch the latest state of all remote branches (in case branch 1 was updated remotely):

  git fetch origin
  

• Merge the completed branch 1 into branch 2:

  git merge branch1
  

• If you hit merge conflicts (totally normal when branches diverge), open the conflicting files, fix the discrepancies, then stage the resolved files and finish the merge:

  git add path/to/conflicting/file
  git commit
  

Option 2: Merge master into branch 2 (if branch 1 was deleted) #

Since branch 1's changes were already merged into master, master now contains all those post-review updates. You can pull those changes into branch 2 via master:

• First make sure your local master is up to date:

  git checkout master
  git pull
  

• Switch back to branch 2:

  git checkout branch2
  

• Merge master's changes into branch 2:

  git merge master
  

• Resolve any conflicts, stage the fixed files, and commit the merge just like in Option 1.

Bonus: Keep a clean history with rebase (use carefully!) #

If you prefer a linear commit history instead of a messy merge commit, you can rebase branch 2 onto master (or branch 1):

• Switch to branch 2:

  git checkout branch2
  

• Rebase onto master:

  git rebase master
  

• If conflicts pop up during rebase, fix them, stage the files, then continue the rebase:

  git add path/to/conflicting/file
  git rebase --continue
  

Critical Note: Only use rebase if branch 2 hasn't been pushed to a shared remote repository yet. Rebase rewrites commit history, which can cause major headaches for other collaborators working on the same branch.

Quick Safety Tip #

Before making any major changes, it's always smart to create a backup of branch 2, just in case something goes sideways:

git branch branch2_backup

That way you can easily revert to the original state if needed.

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