git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Unable to Revert Commit

From
RMRex Macey <rex@macey.us>
Date
Nov 27, 2014, 16:35 UTC
Message-ID
<547752ED.8010208@macey.us>

"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

Next: Brandon McCaig
Message 1 of 3 in “Unable to Revert Commit”
  1. Rex MaceyNov 27, 2014
  2. Brandon McCaigNov 28, 2014
  3. Philip OakleyNov 28, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.