The only thing that i find often inconvenient in SmartGit - the way conflicts are displayed and handled in Conflict Resolver.

SmartGit view:

JetBrains GitClient view:

The later has much more clear (and less scaring :) LOL)  picture of the conflicts.

Would be perfect if we are able to switch to yet another view on the conflicts that would be similar to the one on the second screenshot!

Thank you!

At the moment it is only possible to create a GitHub pull request from the log window. Please also implement this option in the working tree window

In the branches section, add the option to sort all local branches to the top of the list.

When traversing changes either in working tree or stage, SmartGit resets "Ignore Whitespace" toggle after switch to next file back to default state which is untoggled.

This is to emphasise not missing unexpected or other kind of important w/s changes.

However from time to time one would need to traverse files quickly, to skim through changes at glance which is often not possible when w/s are highlighted.

I'm unsure how to approach the solution. E.g.: low lever setting for reset behavior, put it to hamburger menu of diff window, diff setting, double click on toggle would make it permanent, …

File Views lacks Tree View option. When validating code changes not only code is checked but also files structure and files placement.

When file path gets obscured by ellipses having tens (or hundreds) of files it gets quite impossible to validate placement, replacements or movements of files is correct.

Simple, classic, tree view would come handy for these cases.

Ability, when committing changes, to fixup a past commit (if there are no merge conflcts for subsequent commits)

Suppose I have committed 

A > B > C 

..in that order. I realize I missed something on commit B, if I want to fix it I have to introduce a new Commit D, and make an interactive rebase to move commit D so it becomes A > B > D > C and merge commit B and D (we often refer to part of this process as a fixup)

I suggest improvements to the smartgit interface to be able to perform this automatically. Note that this procedure is now facilitated by the --fixup param when committing as explained here

Idea : in the commit window, we already have a "select" menu that can help copy previous messages. Introduce a similar "fixup" select menu, which allows selecting a commit similarly to "select", but when a previous commit is selected this way, transform the "commit" button so it becomes a "fixup" button and actually performs

git commit --fixup=[selected commit ref] # Commit indicating a fixup
git rebase -i --autosquash [selected-commit-ref]~1 # merge fixup commit into broken commit

(ans similarly for the other button "fixup and (force) push"

References

https://stackoverflow.com/questions/3103589/how-can-i-easily-fixup-a-past-commit

At least as of v21.1.x the Working Tree window used alternating table row colors for the various files displayed. Could that be brought back in the current version(s), either as a setting or property of some sort? Or is there a way to do it already in the current version somehow?

Thanks,

Of course, you can also press CTRL + P and then enter the relevant subfolder to quickly see the desired branches. But unfortunately this is also very cumbersome if you want to merge the respective branch into your current branch:

1. You have to click into the branches-view.
2. You have to press CTRL+P and enter the subfolder you are looking for (and rememeber those names).
3. YouI have to select the desired branch. (Unfortunately, in this view you don't have the option to merge the selected branch with your current branch).
4. So you have to reveal the branch.
5. Finally you can merge the desired branch into your current branch.

Desired behavior:

I would like to define a filter for the branches-view and attach the filtered view as a separate tab in Smartgit (with a self-defined title). This way we could have multiple tabs for the branches-views (each with different filters and title).

Not only would this greatly improve the overview, but it would also reduce the number of steps that need to be taken:

1. Click into the filtered branches-view and select the desired branch.
2. Merge the desired branch into the current branch.

It could come useful to have totals for commit in Files view.

I.e. counts: total, renamed, changed, removed, added.

Please bring back the persistent "Ignore Whitespace" toggle. Since some build of 24.1, the "Ignore Whitespace" option resets every time I switch files, and I have to re-choose it constantly.

I spend a lot of time just viewing my working tree changes, and staging/unstaging hunks. Viewing significant code changes without the noise of whitespace deltas is important.

Therefore, I really want my viewing preference to persist. The new "Ignore WS" button is a welcome improvement, having it's state visible, and togglable with one click. (I would similarly welcome a "Ignore EOL" button 🙂). But constantly having to re-instate my preference, even just switching to another file then back, is tiresome.