Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
This is my problem:
(oneclickcosvirt)[marcintustin@web316 oneclickcos]$ hg merge
abort: outstanding uncommitted changes
(use 'hg status' to list changes)
(oneclickcosvirt)[marcintustin@web316 oneclickcos]$ hg ci -umarcintustin
nothing changed (4 missing files, see 'hg status')
Hg won’t merge because of outstanding changes, but there are no outstanding changes. What to do?
In addition to @gavinb’s answer, it is also possible to pass the
--forceoption:That will also perform the usual merge operation.