Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

What does "use 'hg update' to get a consistent checkout" mean?

I accidentally ran hg update featurebranch while my working directory had changes. When it asked me to resolve merge conflicts on the first file, I immediately pressed Ctrl-C to kill the command. Now when I try to commit I get the error:

abort: last update was interrupted
(use 'hg update' to get a consistent checkout)

What does that mean and how do I recover from this situation?

like image 366
Philip Avatar asked May 16 '14 14:05

Philip


1 Answers

hg update -r . will do a no-op update to the working branch without changing any files and fix the error message.

I'm not entirely sure how/why it works, so if someone explains that I will accept their answer.

like image 161
Philip Avatar answered Oct 20 '22 07:10

Philip