Replies: 1 comment
-
|
We have no dedicated conflict resolve workflow |
Beta Was this translation helpful? Give feedback.
0 replies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
-
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.
Beta Was this translation helpful? Give feedback.
All reactions