branch diverged and no staged files

[likun7981]

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?