Skip to content

Add hide Git conflicts on zero option - #562

Merged
sirmalloc merged 2 commits into
sirmalloc:mainfrom
pelmered:feat/git-conflicts-zero-state
Sep 3, 2026
Merged

Add hide Git conflicts on zero option#562
sirmalloc merged 2 commits into
sirmalloc:mainfrom
pelmered:feat/git-conflicts-zero-state

Conversation

@pelmered

@pelmered pelmered commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

Add option to hide git conflicts status when there are no conflicts.
Also removed the space between the icon and the number to make it look like the other git widgets.

Closes #561

Screenshots

Before

Screenshot 2026-08-26 at 19 02 38

After

Screenshot 2026-08-26 at 19 03 12

pelmered and others added 2 commits August 26, 2026 18:48
# Conflicts:
#	docs/USAGE.md
#	src/widgets/GitConflicts.ts
#	src/widgets/__tests__/GitConflicts.test.ts
@sirmalloc
sirmalloc merged commit abe7c23 into sirmalloc:main Sep 3, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Option to hide or change appearance of "Git Conflicts" widget when there are no conflicts.

2 participants