-
Notifications
You must be signed in to change notification settings - Fork 334
Open
Description
It's currently a bit cumbersome to resolve merge conflicts. It's also not all that inuitive.
Current Merge Conflict Workflow
Right now, if there is a conflict in a merge you get a notification about the conflict
Typically you'll just dismiss this notifcation. It's only really useful to hint new users on how to resolve the conflict (by opening "local changes" and comitting the merged file).
Then you have to switch to "local changes" view.
There you can either
- click the conflicted file to see the options "use mine", "use theirs" and "open external merge tool"
- right click the conflicted file and select "open in merge tool"
My suggestions to make things a bit faster/easier:
- do not display the notification about the merge conflict (it should still be written to the log)
- automatically switch to "local changes"
- pre-select the first file with a conflict
- double clicking a conflicted file opens external merge tool
- add a short hint text to the "Conflicts detected" view that opens when selecting a conflicting file. Something like "resolve the conflict and commit the file". This is to replace the hint from the notification
- improve the "merge in progress" banner
- add a button "resolve" to the "merge in progress" banner that opens "local changes" and pre-selects the first file with conflict
- make it more obvious that the merge has not completed due to a conflict
- sidenote: I think the banner could use a different color, the current one does not look that nice in the dark theme in my opinion.

Metadata
Metadata
Assignees
Labels
No labels