search

fork-dev / TrackerWin

Bug and issue tracker for Fork for Windows
461 stars 10 forks source link

Add option to hide the merge conflict warning #1965

Open ddbtrmatic opened 1 year ago

ddbtrmatic commented 1 year ago

When performing a rebase operation, if there is a conflict, two warning dialogs are displayed. These dialogs explain that there has been a conflict and it must be resolved. The conflicted files will be shown in the unstaged files list, so I find this dialog to be redundant. It would be really nice not to have to close out of these dialogs every time, particularly when rebasing many commits with many conflicts. A "Do not show again" option or preference in the settings.

image

DanPristupov commented 1 year ago

When performing a rebase operation, if there is a conflict, two warning dialogs are displayed. These dialogs explain that there has been a conflict and it must be resolved.

Do you mean same dialog is displayed twice?

ddbtrmatic commented 1 year ago

When performing a rebase operation, if there is a conflict, two warning dialogs are displayed. These dialogs explain that there has been a conflict and it must be resolved.

Do you mean same dialog is displayed twice?

The primary request is to limit the number of dialogs that need to be clicked through. When stepping through a significant merge that will have many conflicts across different commits, the dialog becomes redundant beyond the first appearance. Each time I resolve a set of merge conflicts and commit, the next set of conflicts will be shown in the primary window. Since I'm already monitoring the process and just resolved some conflicts, the dialog doesn't serve any purpose beyond being another window to close out of.