Re: Unable to Revert Commit

2014-11-28 Thread Philip Oakley
From: "Rex Macey" "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 f

Re: Unable to Revert Commit

2014-11-28 Thread Brandon McCaig
Rex: On Thu, Nov 27, 2014 at 11:35:57AM -0500, Rex Macey wrote: > "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

Unable to Revert Commit

2014-11-27 Thread Rex Macey
"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"