Tumblelog by Soup.io
Newer posts are loading.
You are at the newest post.
Click here to check if anything new just came in.

In general git has some terrible cryptic error messages.

from Stories from the Land of Rob:  

My favourite example is if you modify a file and then pull a change that modifies that file before you commit it:

Updating beb8c37..b953e6f
test: needs update
fatal: Entry 'test' not uptodate. Cannot merge.

WTF? what does uptodate mean? why isn’t it up to date? whats gone wrong? what should i do?
Surely something like:

Cancelling pull as 'test' has changes that would be overwritten by this pull. Please commit your changes or force an overwrite using the '--force' flag

would be a lot better?

Don't be the product, buy the product!