Resolving Merge Conflicts

[caheredia]

Is there a method to handle merge conflicts with gitUI? I know Lazygit allows you to choose the specific hunks from the working branch and Master in the event of a conflict.

My favorite method for handling conflicts is fugitves/vimdiff method of displaying a 3-way diff for reconciling changes.

If gitUI has a merge conflict workflow maybe it should be added to the README.

[extrawurst]

We have no dedicated conflict resolve workflow