commitizen/cz-cli

branch diverged and no staged files

Open

#445 opened on Aug 2, 2017

View on GitHub
 (0 comments) (0 reactions) (0 assignees)JavaScript (552 forks)batch import
bughacktoberfest

Repository metrics

Stars
 (16,309 stars)
PR merge metrics
 (Avg merge 23d 13h) (6 merged PRs in 30d)

Description

Now the status like this

 $ 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?

Contributor guide

Research direction
Examine the source code to understand how cz cli determines whether there are staged files and how it handles merge commit scenarios. Look for ways to allow commits without staged files when in a merge state.
Tech stack
javascript
Domain
clideveloper experience
Issue type
Bug
DifficultyEstimated implementation difficulty for a new contributor, from 1 for very small changes to 5 for expert-level work.
3
Estimated timeA rough time range for an experienced contributor to investigate, implement, test, and prepare a pull request.
Half day
Activity statusHow available the issue appears right now: fresh, active, stale, blocked, or waiting on maintainer input.
Active
ClarityHow clearly the issue explains the expected change, acceptance criteria, and next step.
Clear
Prerequisites
GitNode.js
Newbie friendlinessA 1-100 score estimating how approachable this issue is for first-time contributors.
65