commitizen / commitizen/cz-cli
branch diverged and no staged files
- 主要語言
- JavaScript
- 星號
- 17.5k
- 分支
- 566
- 平均合併
- 8 小時 16 分鐘
- 30 天內合併 PR
- 1
描述
Now the status like this
```bash
$ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 4 and 1 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
All conflicts fixed but you are still merging.
(use "git commit" to conclude merge)
```
here , I have to use `git commit` instead of `git cz`, because no staged files, the `git cz` will report error `No files added to staging! Did you forget to run git add?`.
But I do not want to use `git commit`, do you have any idea to resolve it?
貢獻指南
研究方向
此 issue 未指定檔案或測試。首先重現所示的分支已分歧且正在合併的 Git 狀態,以及 `git cz` 錯誤,然後檢查 CLI 如何處理沒有 staged 檔案的 merge commit。完成標準應是為這個 merge commit 工作流程明確定義解決方案。
由索引模型根據 Issue 內容生成。
評估
- 技術堆疊
- git, javascript
- 領域
- cli, tooling
- Issue 類型
- 缺陷
- 難度
- 4/5
- 預估耗時
- 3-5 天
- 活躍度
- 停滯
- 描述清晰度
- 需要釐清
- 新手友好度
- 25/100