I keep some of my local configuration in assume-unchanged files. I have several branches created over time, and assumed-unchanged files have evolved in between (adding more local config). If I try to checkout an older branch, I get:
error: Your local changes to the following files would be overwritten by checkout:
<some assume-unchanged files>
Please, commit your changes or stash them before you can switch branches.
I don't want to commit them and cannot stash them (even with the --include-untracked option):
$ git stash
No local changes to save
Is there a solution for this, or a better workflow for local changes to keep uncommitted?
At the moment you will need to use a proper .gitignore file or the excludes mechanism. Assume-unchanged means something different.