0

Add "Merge" button to "The working tree is in merging-state" bar

griscom 6 months ago updated 6 months ago 2

SmartGit shows an "Abort" button in a "The working tree is in merging-state" bar when you're in the middle of a merge. But, you have to know that to "merge" you click on the standard "Commit" button.

Proposal: add a "Merge" button to the left of the "Abort" button.

Second thought: instead of "Merge", have "Continue". This would act just like the "Commit" button, and would continue the process of merging.

... am I missing subtleties?

The "Commit" button in the toolbar, equivalent to choosing the "Local/Commit..." menu item.