【发布时间】:2015-04-09 22:10:31
【问题描述】:
我使用 Sourcetree 作为我的版本控制系统,带有一个 master 和一个 develop 分支、feature、hotfix 和 release 分支。 意外地,我在分支 master 上,致力于它并推送到我应该致力于我的特性分支特性/新设计的原点。 现在在执行 git flow 发布过程时,我得到了下面描述的两个错误,因此 bitbucket 不会触发连接的 dploy.io 上的部署。 问题是:我怎样才能在没有错误的情况下恢复我心爱的 git flow 过程? :)
详情: 在没有提交的地方,我在完成发布后立即执行了以下步骤 - 只是为了向您展示发生了什么:)
1) Git 流程完成功能新设计(同时保留它)可以正常工作
Summary of actions:
- The feature branch 'feature/new-design' was merged into 'develop'
- Feature branch 'feature/new-design' is still available
- You are now on branch 'develop'
Completed successfully.
2) 那时正在开发中并开始新版本没有错误
行动总结: - 基于“develop”创建了一个新分支“release/1.7j” - 你现在在'release/1.7j'分支上
Follow-up actions:
- Bump the version number now!
- Start committing last-minute fixes in preparing your release
- When done, run:
git flow release finish '1.7j'
Completed successfully.
3) 发布 1.7j 并完成它会引发错误。 使用的参数:带有消息的标签,删除分支并将更改推送到远程。
Switched to branch 'master'
Deleted branch release/1.7j (was d1277f5).
Everything up-to-date
Everything up-to-date
To 'this is the correct address of the repo'
* [new tag] 1.7j -> 1.7j
error: unable to delete 'release/1.7j': remote ref does not exist
error: failed to push some refs to 'this is the correct address of the repo'
Could not delete the remote release/1.7j in origin.
Completed with errors, see above.
4) 点击关闭后master分支如下图所示:
如果您需要更多信息,请告诉我。感谢您帮助我:)
【问题讨论】:
标签: git branch atlassian-sourcetree