10

我的个人 Wordpress 安装是从GitHub 上的wordpress git 镜像克隆的。我检查了分支“stable”（git checkout -b stable 2.7.1）的 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 标签？

4

2 回答 2

16 
# git checkout stable
# git reset --hard 2.8

你去吧。

于 2009-06-18T07:25:21.957 回答
11

使用“git checkout 2.8”。

如果你想移动“稳定”，你可以简单地删除/重新创建它：

$ git checkout 2.8
$ git branch -d stable
$ git checkout -b stable
于 2009-06-18T04:08:54.757 回答