Your comments
Please try the 17.1 preview and use Interactive Rebase - it also is available for the HEAD's history in the Log window.
It's already there: just use a .gitflow file www.syntevo.com/doc/display/SG/Git-Flow#Git-Flow-Configureflow.commands.configure.
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.
Why do lots of GIT branching papers use a horizontal layout? I think
because it's more intuitive and compact (because text is naturally drawn
horizontally).
Because in a text document a horizontal graphic needs less space and because the commit message information is not shown.
This could be dangerous if you are in the wrong branch and have already started with a new feature (e.g. created a new file) and then want to switch to the right branch for commit - bang, your changes are lost. I don't want the user to blame us for having added such a dangerous option.
For Git repositories this will be implemented in 17.1 preview 5.
This is expected because | only works in shells. You would have to run a shell script that performs the desired command.
Please contact smartgit@syntevo.com if you need to get support. This is rather for feature requests.
The current work-around, of course, is to apply a full stash (maybe with conflicts) and discard all unnecessary changes. Maybe this also gets obsolete when getting used to stashing selected files.
Customer support service by UserEcho
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?