On 4/22/23 09:28, andy pugh wrote:
On Sat, 22 Apr 2023 at 03:45, gene heskett <ghesk...@shentel.net> wrote:
hard reset?
git reset --hard
doesn't do it, some uncommitted stuff or something
And that machine is still on buster, can't run bullseye, bullseye's
python is too new
c/p from that screen:
pi@rpi4:/media/pi/workspace/bullseye-linuxcnc $ git reset --hard
HEAD is now at 57927faa8b Merge branch '2.9'
You have new mail in /var/mail/pi
pi@rpi4:/media/pi/workspace/bullseye-linuxcnc $ git pull
Auto-merging src/po/tr.po
CONFLICT (content): Merge conflict in src/po/tr.po
Auto-merging src/po/gmoccapy/tr.po
CONFLICT (content): Merge conflict in src/po/gmoccapy/tr.po
Auto-merging src/po/gmoccapy/es.po
CONFLICT (content): Merge conflict in src/po/gmoccapy/es.po
Auto-merging src/po/gmoccapy/cs.po
CONFLICT (content): Merge conflict in src/po/gmoccapy/cs.po
Auto-merging src/po/es.po
CONFLICT (content): Merge conflict in src/po/es.po
Auto-merging src/hal/drivers/mesa-hostmot2/hostmot2.h
Auto-merging src/emc/task/emccanon.cc
Auto-merging src/emc/rs274ngc/rs274ngc_pre.cc
Auto-merging src/Makefile
Removing lib/python/gladevcp/glade-icons/widget-gladevcp-speedcontrol.png
Removing
lib/python/gladevcp/glade-icons/widget-gladevcp-icon_filechooser.png
Removing lib/python/gladevcp/glade-icons/widget-gladevcp-hal_dro.png
Removing lib/python/gladevcp/glade-icons/widget-gladevcp-combi_dro.png
Removing lib/python/gladevcp/glade-icons/README
Auto-merging lib/python/gladevcp/drowidget.py
CONFLICT (content): Merge conflict in lib/python/gladevcp/drowidget.py
Auto-merging docs/src/gui/qtvcp.adoc
CONFLICT (content): Merge conflict in docs/src/gui/qtvcp.adoc
Auto-merging docs/po/de.po
CONFLICT (content): Merge conflict in docs/po/de.po
Auto-merging docs/man/.gitignore
Automatic merge failed; fix conflicts and then commit the result.
So I'm lost, have fun at the meeting, this can wait.
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
Genes Web page <http://geneslinuxbox.net:6309/>
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
