A way to accept all incoming/local hunks in merge conflicts for files/folders?

[DominickVale]

Like in jetbrains editors, where you can right click on a folder/file in the git panel and select whether to accept all local or incoming changes, instead of having to stage all hunks manually. I saw there is a "accept all hunks" functionality, but it only accepts both incoming and local... So is there a way to do it currently?

[mark2185]

Currently only through a custom command, see the discussion here.

[DominickVale]

Thank you. It works on files, but it doesn't seem to work on folders...

[mark2185]

Yeah, that's discussed here. I've added your requirement to that issue as to better keep track of it.