Re: Unable to Revert Commit

From: Philip Oakley <philipoakley@iee.org>
Date: Nov 28, 2014, 14:31 UTC
Message-ID: <3CDBFA67BE744B97B9C40FB3F3115A7D@PhilipOakley>
In-Reply-To: <547752ED.8010208@macey.us>

From: "Rex Macey" <rex@macey.us>

Show 24 quoted lines

> "Unable to Revert Commit ... Resolve the conflicts in your working 
> directory and commit them before trying the revert again".  Please 
> help me understand how to resolve the conflicts.  Here's what happened 
> (as best as I remember).
> Created a windows folder "github_learn" (not under my 
> \documents\github  folder) ;
> Created a file file1.r.
> Dragged folder into Github for Windows.  Committed; I could see the 
> file in my directory, Github for Windows, and on the server 
> (github.com);
> I modified the first file.  Checked that there were different versions 
> and then committed it.;
> I created a second file, file2.r Committed it.  All good.;
> Then I tested whether I could retrieve the first version of file1.r 
> (before modification).  In the History area of Github for Windows, I 
> can see this version.  I click on that, and then I click on "Revert" 
> which produces the error.
>
> I am very new to Git and have read some of the documentation and this 
> exercise is my attempt to test myself.  So far my grade is not good. 
> I appreciate any guidance including links to instructions.
> Thank you.
> Rex Macey
> --

I belive that what is trying to be said is:

 "You have a 'dirty' worktree which currently contains un-resolved 
conflicts. It would be unwise to attempt a revert, which may further 
conflict with those conflict markers. The easy way out is to resolve 
those conflict markers first."

I'd agree that for the beginner, the compactness of the error messages can be a be difficult to understand.

--

Philip