.gitignore and merge

How did people handle keeping their changes across branches?
Not having style.css and style.css.map in the .gitignore caused me a bit of difficulty.

I ended up using git stash save -a and git checkout -f origin/branch as a quick and dirty solution.
But sometimes code that should have been added by us was not there in the following branch.

