Fix: merge conflict missing files: added by them

NeogitOrg / neogit

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

MIT License

4.03k stars 239 forks source link

Fix: merge conflict missing files: added by them #1223

Closed marcocofano closed 7 months ago

marcocofano commented 7 months ago

Hi,

first time PR, small one.

This fixes: #1222

I had a fix for #1176, but then realized that was solved today , already :)

So, I took the learning experience to fix another: #1222

During a merge conflict, when the mode is UA: unmerged, added by them, the case was missing and not displaying in the status buffer. Also used #1189, to use discard (keybind x) to choose between ours/theirs version, which was not available for UA or AU cases.

Hope it helps, :)

CKolkey commented 7 months ago

Haha, wanna see something funny? My first commit here: https://github.com/NeogitOrg/neogit/pull/450

Appreciate the contribution 😉

marcocofano commented 7 months ago

That was not a small one, our eyes and OCD brains thank you. Anyway, installed the plugin a week ago and fell in love, amazing job!