wtorek, 26 listopada 2013

Problem with git rebase - 'Your local changes to the following files would be overwritten by merge'. No local changes?

This will be definitely a very short post. However, I spent so much time trying to figure out what the heck is going on and why I cannot rebase, that I just decided to write it down. The help itself came from my brother: The problem occurs when you work on the same git repo with someone using different operating system then you. In my case it was Windows and Linux. When I was trying to rebase my commit on a fetched branch, I would alwasy get an error thet there are local uncommited changes, wheras of course all of my changes were already commited. The problem itself can be fixed with following simple trick:
git config --global core.trustctime false
More info on the issue can be found on stackoverflow