If you pull from a repo containing a file such as Invalid<"file">.xml then SmartGit on Windows throws error messages about not being able to stash, merge, etc. The only route forward issuing gitbash to resolve before you can resume using SmartGit.

Alphabetical ordering doesn't really scale well when you work with a lot of repositories. I'd like to be able to custom order (either via drag-and-drop or arrow buttons) my groups and repositories so I can shift them around as priorities change without needing to put them in "A Most Important Group!"

If i had one commit unpushed i wanted to see it down below in the outgoing section. The problem here is that there is no option here to filter only the unpushed items.

Right now when you compare changes in two panel diff tool, or three panel diff tool you can got case when diff tool allows you only to replace code. It can happen when in two branches the same line of code has been changed and you are trying to merge these files.

It would be great to have possibility to force diff tool to insert diff line if SHIFT key is pressed.

When switching to/from a branch where new files are added sometimes files are left behind (soapui project xml for example), when switching back to the branch with the new files you'll often get the warning "The following untracked working tree files would be overwritten by checkout", and a list.

It would be nice to have an option added to this dialog to basically say "ok, overwrite them". Instead of having to look them up 1 by 1, and manually deleting them before trying to switch to the branch a second time.

Hello,

Could an option be added to include the --update-refs arguement for rebase operations? Either in drop down menu during rebase or just a checkbox in preferences / advanced settings would be fine from my perspective.

I quite often work on large features that then get split into multiple branches stacked on top of each other.

I generally work on projects using a rebase strategy rather than merging branches into main, so I end up wanting to rebase the stacked branches onto the head of main for testing / submission.

Currently I end up needing to drag/drop the whole branch onto main to rebase it as just the lastest branch name, then manually drag the intermediate branch labels up to where they're supposed to be in the stack which is quite tedious and error prone. 

Alternatively I drop to the terminal to run the rebase there with --update-refs and it moves all the intermediate branches for me along with the rebase.

I can't emphasise how many times per day I fight this issue: I change something in my editor, double-click in Smartgit to see the differences and I realise that tab settings is wrong. So I go to View -> Settings and adjust it. Yet again. Sure, I can save it as default but that works only until I switch to another repository.

How much easier my life would be if Smartgit read .editorconfig (https://editorconfig.org) from given repository!

Add ability for Squash context menu in log view to work for non-consecutive commits. Currently it only works for consecutive commits. If non-consecutive commits are chosen then smartgit would trigger a interactive rebase that does the following:

- reorder selected commits so they are consecutive

- then squash them

If there is an merge issue then smartgit drops into interactive rebase resolve step so use can resolve (or cancel).