Allow switching branches with pending changes but "no action"

[Danielku15]

Fork allows branch switching without applying anything to the pending changes. I think it works this way (copied from the Brave search AI summary):

Git switch with uncommitted changes:

• If the changes in your working directory do not conflict with the target branch (i.e., the files are identical or the changes are in untracked files), Git will allow the switch and preserve your changes in the working tree.
• If the changes conflict (e.g., a tracked file is modified in both branches), Git will refuse the switch and show an error:
  error: Your local changes to the following files would be overwritten by checkout.

Stashing can force you into a merging state and it happened to me various times that accidentally I lost changes (user error). Most of the time I prefer seeing errors if "clean branch switches" do not work, it tells me I should really first commit/discard/stash the pending changes depending on what the changes are.

[love-linger]

#2196

[Danielku15]

This sounds similar while I personally would have thought of a flow that integrates to the current logic of asking what to do while switching branches "() stash & apply () discard (x) do nothing". And the do nothing might cause a git error if git checkout/git switch fails, shown in the existing style.

[love-linger]

In previous versions, SourceGit did provide the Do Nothing option. However, it was removed later. During this period, many people who were not familiar with git did not understand the specific meaning of Do Nothing and dared not use it.

[Danielku15]

I get the point of making things more intuitive also for git newbees and it's great to add extended features for the ease of use. Not providing the git default seems also rather a bad choice.

Tool	No Changes (fail if conflict)	Stash&Apply flow	Discard option
Git CLI	✅	❌	✅ (-f)
Fork	✅	✅	✅
SourceGit	❌	✅	✅
SourceTree	✅	❌	✅
GitKraken	✅	✅	❌
GitHub Desktop	❌	✅ (stash on old branch or stash+apply)	❌

My two main reasons for disliking auto stash are:

1. Sometimes I just want to quickly check things on other branches without actually wanting to add them to the other branch. Stash&Reapply will bring me into a conflict resolving state interrupting my flow and imposing risks of losing changes. I prefer not to switch if switching causes conflicts and take care of stashing the conflicting parts first. In such flows I often lost changes I had to recover.
2. It feels significantly slower going through the stash workflow. Especially on my company computer where a fleet of security and anti virus software scans all disk activity.

I always prefer if tools give me control instead of doing to much automatism causing surprises and data loss.