I would have changed the paths in repository-grouping.yml and repositories.yml.

Please describe your use-case in more details.

If you have a problem that you think is a bug, please contact smartgit at syntevo dot com.

Please try setting the low-level property standard.pull.allowDirtyWt to true.

What to show for the hard case when swapping two commits (e.g. using drag and drop)?

Please note that the conflicting file contains already "ours" and "theirs" from Git. We are reluctant to modify these files automatically.

Why not use the existing file table(s) and the Commit view (Window | Commit)?

What about using tags as a temporary workaround?

I just meant, this information is already there, just not in a fancy popup. BTW, when exactly a popup should be shown if a dialog is triggered by the command - should the popup delay showing the dialog?

The menu items should already show the shortcut. Same for the tooltip of a toolbar button.