geometry: git_conflicts issue since zplug 2.3.1

Hi,

Updated to zplug 2.3.1, and since then have had lots of issues with zsh, there is also this issue, where the theme is not displayed, but this error keeps appearing:

prompt_geometry_git_conflicts:[:10: integer expression expected: 1\n1

I have an issue posted (here, for some more information)[https://github.com/zplug/zplug/issues/268]

Do you know if this is anything caused on your end, or a symptom of a larger issue?

About this issue

Original URL
State: closed
Created 8 years ago
Comments: 15 (9 by maintainers)

Most upvoted comments

Looking further it seems you have to have at least two merge conflicts during a rebase.

Issue I’m facing though is here it’s failing to determine total:

▲ ~ echo $conflicts
README.md
source.c

▲ ~ grep -c '^======$' $conflicts
grep: README.md
source.c: No such file or directory

▲ ~ grep -c '^======$' README.md source.c
README.md:0
source.c:0

desyncr on Nov 19, 2016

Seems to be fully functional, just pointing it out incase it’s a symptom of something bigger.

tomspeak on Oct 16, 2016