On 4/22/23 11:37, Greg C wrote:
No meeting for me, just making a sign as a wedding gift in the garage.
It’s likely mad because you made changes to some file (or added a file).
You need to stash the changes before rebasing or resetting (or even
pulling).
git stash
Then afterward you can do:
git reset --hard
??
Steffen
> Gesendet: Samstag, 22. April 2023 um 17:36 Uhr
> Von: "Greg C"
> An: "EMC developers"
> Betreff: Re: [Emc-developers] my copy of bullseye git repo needs a hardreset,
> but its not in git manual, howto?
>
> No meeting for me, just making a sign as a wedding gift
No meeting for me, just making a sign as a wedding gift in the garage.
It’s likely mad because you made changes to some file (or added a file).
You need to stash the changes before rebasing or resetting (or even
pulling).
git stash
Then afterward you can do: (Of course if you didn’t intend to
On 4/22/23 09:35, Greg C wrote:
Hey Gene,
I’m not a GitHub expert, but I the last time I had this issue the following
fixed it:
git rebase
Thanks Greg, but it also fails:
pi@rpi4:/media/pi/workspace/bullseye-linuxcnc $ git rebase
docs/po/de.po: needs merge
docs/src/gui/qtvcp.adoc: needs
On 4/22/23 09:28, andy pugh wrote:
On Sat, 22 Apr 2023 at 03:45, gene heskett 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:
