Your comments

We've tried to implement this feature, but found it not easy and intuitive to use. Instead, the next 17.1 preview build will allow to open the Index editor at the same place where the Changes view is, so you can edit there.

I'm not sure whether I should select now Declined or Completed - I use the latter. ;)

There is nothing "attached" to commits in Git. The detection which Git ref has this commit in its history takes some time and it would not help in usual back- and forth-merged branches.

This is the screenshot of a Mercurial repository. In Git this is impossible.

Maybe it makes sense to have a View-menu option to show/hide submodule entries in the file table regardless of their modified state? If unselected, hiding uninitialized submodules also could be possible - currently, they always show up.

For "Add" and "Remove" are a pair of opposite actions. "Delete" is something else. At least in one other Git client I saw "Track" instead of "Add" and "Untrack" instead of "Remove". Would this have been better for you?

Please try the 17.1 preview and use Interactive Rebase - it also is available for the HEAD's history in the Log window.

Please make clear in your screenshot what master, origin/master is and what the feature and feature/origin are.

It is very easy.

Way 1: sort the file list by State. Then the conflicting files are all one beside each other.
Way 2: (temporarily) unselect View|Show Stages Files, e.g. by using the corresponding toolbar button.