Great!
Thank you!
Ken
On Oct 13, 10:15 am, Konstantin Khomoutov wrote:
> On Oct 13, 9:05 pm, Ken 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 to stuff the conflicting file
On Oct 13, 9:05 pm, Ken 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 to stuff the conflicting file using any
contents you want and then commit this.
So you can verify the state just by
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 wrote:
> On Oct 13, 8:44 pm, Ken wrote:> Thank you very much for
> your help Konstantin!! I submitted the first
> > command:
>
> >
On Oct 13, 8:44 pm, Ken 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) kn
Well, not "the same" but that my changes have been merged...
K
On Oct 13, 10:04 am, Ken 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 public/images/NewM
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 public/images/NewMexico_jul_1.jpg
git commit
Is there some way I can compare the "master" branch with the
"add_articles" branc
On Oct 13, 8:10 pm, Ken wrote:
> I need some help. I have two branches: "master" and "add_articles".
> I've been doing my work in add_articles and I wanted to merge the
> changes in to master prior to doing a deploy of my application.
> Here's the sequence of events:
> git merge add_articles - g
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, 9:
On Oct 13, 8:10 pm, Ken wrote:
> I need some help. I have two branches: "master" and "add_articles".
> I've been doing my work in add_articles and I wanted to merge the
> changes in to master prior to doing a deploy of my application.
> Here's the sequence of events:
>
> git branch - showed the
