On Oct 13, 8:44 pm, Ken <kohud...@gmail.com> wrote:
> Thank you very much for your help Konstantin!!  I submitted the first
> command:
> git checkout --theirs public/images/NewMexico_jul_1.jpg
> And received the following error:
> error: pathspec 'public/images/NewMexico_jul_1.jpg' did not match any
> file(s) known to git.
> Ideas?
No immediate idea.
Could you do
$ git reset --hard HEAD
(this will bring you to the pre-merging state)
and repeat the merge?

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
For more options, visit this group at 

Reply via email to