It worked well on Saturday, so let's do it again on Sunday: Meet in the Double
Tree lobby at 8:30 for breakfast, then Tormach at 10 for hacking.
--
Sebastian Kuzminsky
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
We are hoping to dedicate a couple of hours tomorrow to deciding how to
release 2.9. The idea would be to discuss it here at Tormach with a link to
Zoom for those who are not here.
No time set yet, but I would imagine anyone who is in Madison is
available all day.
So, who would be wanting to
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
Spectate on the hackfest here:
https://us02web.zoom.us/j/8498381080?pwd=REEzTW4xMngvQWk3SlhqQUdmWFNUdz09
--
Sebastian Kuzminsky
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
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:
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
11 matches
Mail list logo
