Hey Gene,
I’m not a GitHub expert, but I the last time I had this issue the following
fixed it:
git rebase
I think the worst case is you delete the folder and re-clone and recompile
the project to a folder with the same name. Your configs and such should
be separate.
-Greg
On Sat, Apr 22,
On Sat, 22 Apr 2023 at 03:45, gene heskett wrote:
hard reset?
git reset --hard
--
atp
"A motorcycle is a bicycle with a pandemonium attachment and is designed
for the especial use of mechanical geniuses, daredevils and lunatics."
— George Fitch, Atlanta Constitution Newspaper, 1912
Hi all; Subject says it all
A git pull or merge reports:
pi@rpi4:/media/pi/workspace/bullseye-linuxcnc $ git pull
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm '
hint: as appropriate to mark resolution and make a
