Issue Summary

When viewing the branches actions (using the “...” menu), the Merge button remains enabled even when there are conflicts.

However, if you margin-click on the branch and then select “...” the Merge option is correctly disabled with the message “you need to resolve the conflicts.”

Steps to Reproduce

1. Go to the branches view.
2. Under the Actions tab, click the “...” for a branch that has merge conflicts.
3. Click on the Merge button for that branch.
4. A new window opens titled “Merge changes” with the source set as the selected branch and the destination as the main branch. You can select a merge strategy and enter a commit message.

Expected Results

The Merge button should be disabled when merge conflicts exist—just like in the pull request merge view and when accessing branch actions via margin-click (where the Merge button shows “you need to resolve the conflicts”).

Actual Results

The Merge button is enabled, and clicking it results in an error message: “Unable to merge branch [branch name] wasn’t merged into main.”, without displaying actual reason for the merge error.

Workaround

1. Create a pull request to merge the branch. The pull request interface will prevent merging if conflicts are detected and will display the conflicted files.
2. Use the branch margin click to access the “...” menu; here, the Merge button is disabled and displays the message “you need to resolve the conflicts.”