將分支移至新標籤

Question

我的個人Wordpress安裝從GitHub上的wordpress git mirror克隆。我檢查了2.7.1標籤到分支「stable」（git checkout -b stable 2.7.1），並且自那時以來一直運行良好。現在WordPress 2.8已經發布了，我想將我的穩定分支移動到2.8標籤。

我嘗試了以下（所有在穩定的分支），但得到衝突，因爲它試圖應用每個提交，似乎並不正確。我沒有在穩定分支上進行本地更改/提交。

git fetch 
git fetch --tags 
git rebase 2.8 

First, rewinding head to replay your work on top of it... 
Applying: Prepare the branch for the inevitable. 
error: patch failed: wp-includes/version.php:8 
error: wp-includes/version.php: patch does not apply 
Using index info to reconstruct a base tree... 
Falling back to patching base and 3-way merge... 
Auto-merging wp-includes/version.php 
CONFLICT (content): Merge conflict in wp-includes/version.php 
Failed to merge in the changes. 
Patch failed at 0001 Prepare the branch for the inevitable. 

When you have resolved this problem run "git rebase --continue". 
If you would prefer to skip this patch, instead run "git rebase --skip". 
To restore the original branch and stop rebasing run "git rebase --abort". 

如何將我的穩定分支「移動」到2.8標籤？

Answer 1

使用「git checkout 2.8」。

如果要移動 「穩定」，可以直接刪除/重新創建：

$ git checkout 2.8 
$ git branch -d stable 
$ git checkout -b stable 

Answer 2

# git checkout stable 
# git reset --hard 2.8 

你去那裏。