On Tuesday 01 September 2020 20:44:42 Gene Heskett wrote: > On Tuesday 01 September 2020 20:38:54 Gene Heskett wrote: > > On Tuesday 01 September 2020 17:42:48 Gene Heskett wrote: > > > On Tuesday 01 September 2020 17:16:26 Håvard Flaget Aasen wrote: > > > > Looks like it's still failing, you can try to add "cn" to this > > > > line: > > > > https://github.com/LinuxCNC/linuxcnc/blob/master/debian/configur > > > >e# L3 33 > > > > > > I did, but I think a git pull just overwrote it. But it didn't, > > > just gave me hell but its still there. > > > > Same ol same ol but not quite, I think that edit fixed it, at least > > when I got back to checking (messing with my 3d printer) my > > ./make-deb.sh did not error out in < 60 seconds. Whoever wrote that > > check, its a good one, cash it. > > Updated ALL the enabled languages debs, no fussing. Installed, lathe > behaves normally. Cash it. > But, now I am locked out of a git pull, and apparently need to git commit. How do I get back to active status? I have followed the directions in the error message to identify myself, made no difference.
paste from terminal: pi@rpi4:/media/pi/workspace/LinuxCNC-dev $ git config user.email [email protected] pi@rpi4:/media/pi/workspace/LinuxCNC-dev $ git config user.name Gene Heskett pi@rpi4:/media/pi/workspace/LinuxCNC-dev $ git pull Updating eac9994c3..b4e16d7bc error: Your local changes to the following files would be overwritten by merge: debian/configure Please commit your changes or stash them before you merge. Aborting pi@rpi4:/media/pi/workspace/LinuxCNC-dev $ git commit On branch master Your branch is behind 'origin/master' by 6 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: modified: debian/configure Untracked files: docs/man/man9/wj200_vfd.9 share/desktop-directories/cnc.directory src/config.h.in~ src/hal/user_comps/wj200_vfd/wj200_vfd.9 tests/halcompile/userspace/rand tests/halcompile/userspace/rand.comp no changes added to commit Or do I take my two chars back out and see if it will do a pull of your insertion. IDK. Or blow it away and re-clone it all? 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) If we desire respect for the law, we must first make the law respectable. - Louis D. Brandeis Genes Web page <http://geneslinuxbox.net:6309/gene> _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
