Question

我们正在单一存放处使用汞。我们有<条码>master/code>分行和<条码>。分支机构(以及特殊分支机构),但与目前问题毫不相干。

我们贴上<代码>master/code>的分行,分出51.0.102等。我们是在<代码>develop上的。

但现在我们要在前文中打一.。这里有许多关于SO的问题,但似乎没有人解释我想要做什么。

我想做的是:

Update to the point where we released (say 6.1.1)
Fix a number of bugs in that release
Label that resulting code state as (6.1.2)
Do a build of this new 6.1.2 codebase.
Migrate those fixes into the develop branch
Do this in such a way that I can go back to 6.1.2 and fix bugs there if need be.

我似乎无法通过更新这样做。我试图更新第6.1条,设立一个分支机构,从那里进入,但这一条带上了master/code>的分行,包括随后的所有改动。



Is there a standard way of doing this?  Did I explain that correctly so you guys get what I need to do?  It seems like this is a pretty common thing to do.

Answer 1

你不需要明确设立一个分支机构。我这样做的方式是:

Update to the point where you released (6.1.1 in the master branch).
Make changes and commit them.
Tag the latest commit in master as 6.1.2.
Pull those changes into the develop branch.
Continue working.

如果你需要作更多的改动,那么简单地重复上述内容,而是在总务部门使用6.1.2的标签。

Answer 2

You really shouldn t need to create a named branch unless you truly want to have a full-out branch. What you probably want to do is:

update to 6.1.1
make the edits
commit (will create a new un-named branch)
tag that new revision as 6.1.2.
You can then merge that edit into your develop branch

As long as you are updating to a revision earlier than the tip on the Master branch, the commit will make a new branch off of it.

这将使这一版本过时,以便你能够轻易收回。

友情链接