Re: [Emc-developers] my clone repo is out of sync
On 6/16/22 11:12, Steffen Möller wrote: no changes added to commit Short of blowing it away and re-cloning, is there a way to fix it? git reset --hard Thanks Steffen, fixed it right up, a new "git pull" then worked a treat. ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers . 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, 1940) If we desire respect for the law, we must first make the law respectable. - Louis D. Brandeis ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
Re: [Emc-developers] my clone repo is out of sync
no changes added to commit Short of blowing it away and re-cloning, is there a way to fix it? git reset --hard ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
[Emc-developers] my clone repo is out of sync
Greetings All; I try to maintain a git clone of lcnc on my pi, but its been fubared for a few days: pi@rpi4:/media/pi/workspace/buster-linuxcnc $ git pull error: cannot pull with rebase: You have unstaged changes. error: please commit or stash them. pi@rpi4:/media/pi/workspace/buster-linuxcnc $ git commit On branch master Your branch is up to date with 'origin/master'. Changes not staged for commit: modified: docs/po/documentation.pot modified: docs/po/es.po modified: docs/po/fr.po modified: docs/po/hu.po modified: docs/po/nb.po modified: docs/po/vi.po modified: docs/po/zh_CN.po Untracked files: debian/linuxcnc-doc-cn.files debian/linuxcnc-doc-en.files debian/linuxcnc-doc-es.files debian/linuxcnc-doc-fr.files debian/linuxcnc-uspace-dev.files debian/linuxcnc-uspace.files scripts/linuxcnc-python no changes added to commit Short of blowing it away and re-cloning, is there a way to fix it? Thank you. 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, 1940) If we desire respect for the law, we must first make the law respectable. - Louis D. Brandeis ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers