You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
It looks like the only way to run the merge tool is just to try and merge every conflicted file. I'd like an option to just merge the selected file. You can specify the file path on the git mergetool command: https://git-scm.com/docs/git-mergetool
The text was updated successfully, but these errors were encountered:
It looks like the only way to run the merge tool is just to try and merge every conflicted file. I'd like an option to just merge the selected file. You can specify the file path on the git mergetool command: https://git-scm.com/docs/git-mergetool
The text was updated successfully, but these errors were encountered: