Another weird git problem
Lately whenever I have to rebase I get a weird error about how I have a dirty tree and need to commit files. Falling back to patching base and 3-way merge… error: Your local changes to the following files would be overwritten by merge: Please, commit your changes or stash them before you can merge. […]