Actually, the commands I listed in my previous email seemed to do the job. Thank you again for all of your help!!
Ken On Oct 13, 10:08 am, Konstantin Khomoutov <[email protected]> wrote: > On Oct 13, 8:44 pm, Ken <[email protected]> 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 [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
