[git-users] Re: Need Help - CONFLICT (add/add)

2010-10-13 Thread Ken
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? Thanks, Ken On Oct 13,

[git-users] Re: Need Help - CONFLICT (add/add)

2010-10-13 Thread Ken
Well, not the same but that my changes have been merged... K On Oct 13, 10:04 am, Ken kohud...@gmail.com wrote: Thank you for the detailed explanation.  I appreciate it. I did the following and it seemed to work: git checkout add_articles public/images/NewMexico_jul_1.jpg git add

[git-users] Re: Need Help - CONFLICT (add/add)

2010-10-13 Thread Konstantin Khomoutov
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

[git-users] Re: Need Help - CONFLICT (add/add)

2010-10-13 Thread Ken
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 khomou...@gmail.com wrote: On Oct 13, 8:44 pm, Ken kohud...@gmail.com wrote: Thank you very much for your help Konstantin!!  I

[git-users] Re: Need Help - CONFLICT (add/add)

2010-10-13 Thread Ken
Great! Thank you! Ken On Oct 13, 10:15 am, Konstantin Khomoutov khomou...@gmail.com wrote: On Oct 13, 9:05 pm, Ken kohud...@gmail.com wrote: Well, not the same but that my changes have been merged... Depends on what you will consider as being merged, really. This is because you're free