Git：我應該如何將分支和分支分支變更爲主分支？

Question

我分支master作出feature。然後我分支feature做出feature2。現在我想獲得全部的變更爲master。我怎麼做？我想我會這樣做：

git rebase master feature #to make sure history is linear 
git rebase feature feature2 #to make sure history is linear 
git checkout feature 
git merge feature2 --ff-only 
git checkout master 
git merge feature --ff-only 

這會做詭計嗎？我希望我的歷史是線性的，因爲我使用的是git-svn，而且我聽到非線性歷史記錄混淆了它。

Answer 1

這會讓你到你想去的地方。如果您想要一組稍微簡單的命令，您可以省略feature2 - > feature的合併，並將feature2直接合併到master中。

git rebase feature feature2 # Ensure that all feature changes are 
           # included in feature2 

git rebase master feature2  # Create a linear history 
git checkout master 
git merge feature2    # Merge feature2, which contains feature, 
           # into master