Luka Markušić

The original OS was `Windows 10`?

> Using a GUI merge conflict resolution tool :slightly_frowning_face: Well, until we support such a feature _within_ `lazygit` itself, at least launching a merge tool isn't far (`M` opens an...

Well I'm guessing it would require planning and a discussion of what it should look like for which we need Jesse. But if I were to guess of what we...

1. You can partially stage files by pressing `Enter` on a file and staging/unstaging lines with `Space`. 2. Well since this is a specific scenario, where one would have 3...

Do note that if we would implement separate editable buffers, 0.01s after its merge to `master`, there would be a request for it to support {vim,emacs,kakoune,somethingelse}-bindings. I'm not sure we...

Is there a point in doing that when the user could just run the TUI editor externally?

So, what would we gain by adding a 3-way merge conflict editor that has the most basic editing capabilities, namely moving around using arrow keys and typing and deleting? On...

If you really so desire, I guess it's possible to use `IntelliJ` as a mergetool as well (that's what you listed as an example in the original issue) [Someone tried...

I don't think there's a way to do that other than opening it up in an external `mergetool`, which you can use VScode for.

Thanks for reporting! It's a known issue and there are some things already underway (#1648), as well as some work already done (#2079)