When merging a remote branch with rebase, and a conflict occurs, show - Githubissues

NeogitOrg / neogit

An interactive and powerful Git interface for Neovim, inspired by Magit

MIT License

4.1k stars 242 forks source link

When merging a remote branch with rebase, and a conflict occurs, show #1346

Closed CKolkey closed 5 months ago

CKolkey commented 5 months ago

the OID instead of failing to display anything