On Sunday 04 February 2018 12:30:20 Kurt Jacobson wrote:
> Gene,
>
> I don't think you need to do a make clean, I never do, anyways.
>
> This is what I do to update LCNC:
> git pull origin master
Which gets me this:
root@rock64:/media/slash/home/rock64/linuxcnc-dev# git pull origin master
>From git://github.com/linuxcnc/linuxcnc
* branch master -> FETCH_HEAD
Updating 7c626c528..71ab22c6e
error: Your local changes to the following files would be overwritten by
merge:
src/Makefile
Please commit your changes or stash them before you merge.
Aborting
And I don't recall now what I did to the Makefile. And reading it doesn't
give me a clue 4+ months later.
So I'd best blow it away, and do a fresh clone I guess.
git command for that?
Thanks Nicklas.
> cd src
> make -j4
>
> Sometime I have to run ./configure before make, but not always, not
> sure why.
>
> Cheers,
> Kurt
>
>
>
> On Sun, Feb 4, 2018 at 12:22 PM, Nicklas Karlsson <
>
> nicklas.karlsso...@gmail.com> wrote:
> > > Greetings;
> > >
> > > I have a git pull/clone of master a/o Oct 9 2017, so its obviously
> > > out of date a bit. So I assume I have to make clean before I try
> > > to bring it up to Feb 4, 2018.
> >
> > I read the URL changed, know where it is now?
--
Cheers, Gene Heskett
--
"There are four boxes to be used in defense of liberty:
soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
Genes Web page <http://geneslinuxbox.net:6309/gene>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
