git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Rex Macey <rex@macey.us>
To: git@vger.kernel.org
Subject: Unable to Revert Commit
Date: Thu, 27 Nov 2014 11:35:57 -0500	[thread overview]
Message-ID: <547752ED.8010208@macey.us> (raw)

"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

             reply	other threads:[~2014-11-27 16:43 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-27 16:35 Rex Macey [this message]
2014-11-28 13:37 ` Unable to Revert Commit Brandon McCaig
2014-11-28 15:05 ` Philip Oakley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=547752ED.8010208@macey.us \
    --to=rex@macey.us \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).