Git Flow: Finish Feature 错误
in 技术 with 1 comment

Git Flow: Finish Feature 错误

in 技术 with 1 comment

错误

Fatal: The base 'feature/1.1.0' doesn't exists locally or is not a branch. Can't finish the feature branch 'feature/1.2.0'.

原因

因为创建 feature/1.2.0 的时候,是基于 feature/1.1.0 创建的。但是 feature/1.1.0 在 Release 之后,就被删除。所以 Git 找不到 feature/1.2.0 的 Base 分支了。

解决

替换 <workspace_path> 为自己的项目路径,.git 默认是隐藏目录,但是不影响 cd。

cd <workspace_path>/.git
vim config

然后,找到 [gitflow "branch.feature/1.2.0"],修改 base 的值。

[gitflow "branch.feature/1.2.0"]
         base = develop

最后 :wq 保存退出。问题就解决了。

Responses
  1. solved my problem very quickly

    Reply