Re: [Emc-developers] my copy of bullseye git repo needs a hardreset, but its not in git manual, howto?

[gene heskett]

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:  (Of course if you didn’t intend to have any
changes  this step isn’t necessary).

gif stash pop

And your changes would be put back.  I’m not sure what you changed.

If you may have added new files then you need “git stash -u” for the first
stanza.



On Sat, Apr 22, 2023 at 11:23 AM gene heskett  wrote:


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 merge
lib/python/gladevcp/drowidget.py: needs merge
src/po/es.po: needs merge
src/po/gmoccapy/cs.po: needs merge
src/po/gmoccapy/es.po: needs merge
src/po/gmoccapy/tr.po: needs merge
src/po/tr.po: needs merge
error: cannot rebase: You have unstaged changes.
error: additionally, your index contains uncommitted changes.
error: Please commit or stash them.

my cron scripts only do git pulls, I haven't touched it in yonks.


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.


I had to do that a couple years back.  Its not a showstopper as buster
is running it fine, but the buildbot may be hung again, I've had wintel
updates but not armhf's for a few days.  Have fun if you re going to the
meeting. This can wait.


-Greg

On Sat, Apr 22, 2023 at 4:45 AM gene heskett 

wrote:



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 commit.
fatal: Exiting because of an unresolved conflict.
pi@rpi4:/media/pi/workspace/bullseye-linuxcnc $ git merge
error: Merging 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 commit.
fatal: Exiting because of an unresolved conflict.



The un-merged files are not mine. I've not modified anything, its 100% 
git pulls, keeping me synchronized.


I'm beginning to think my crontab entry may have done a pull while 
somebody else was mid commit. So I'll just blow it away. No one has 
commented on the bullseye python being too new problem in a year since I 
reported the python failure, once for armhf, and curious, a week later 
for x86-64 stuffs. ATM their interests are concentrating on getting 2.8 
into bookworm while I'm running master. So everything running linuxcnc 
here is running master, on buster. 3 wintel boxes and the rpi4b.


If that is the case, git should have a pull lockout until the repo is 
clean again while commits are being merged rather than hand out bogus 
data. But that is just a WAG. I don't know enough about git to actually 
modify anything.



Fix?

Thanks,

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 


___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers



___
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
Genes Web page 



___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers



___
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
Genes Web page 

Re: [Emc-developers] my copy of bullseye git repo needs a hardreset, but its not in git manual, howto?

[Steffen Möller]

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 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 have any
> changes  this step isn’t necessary).
> 
> gif stash pop
> 
> And your changes would be put back.  I’m not sure what you changed.
> 
> If you may have added new files then you need “git stash -u” for the first
> stanza.
> 
> 
> 
> On Sat, Apr 22, 2023 at 11:23 AM gene heskett  wrote:
> 
> > 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 merge
> > lib/python/gladevcp/drowidget.py: needs merge
> > src/po/es.po: needs merge
> > src/po/gmoccapy/cs.po: needs merge
> > src/po/gmoccapy/es.po: needs merge
> > src/po/gmoccapy/tr.po: needs merge
> > src/po/tr.po: needs merge
> > error: cannot rebase: You have unstaged changes.
> > error: additionally, your index contains uncommitted changes.
> > error: Please commit or stash them.
> >
> > my cron scripts only do git pulls, I haven't touched it in yonks.
> >
> > > 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.
> >
> > I had to do that a couple years back.  Its not a showstopper as buster
> > is running it fine, but the buildbot may be hung again, I've had wintel
> > updates but not armhf's for a few days.  Have fun if you re going to the
> > meeting. This can wait.
> > >
> > > -Greg
> > >
> > > On Sat, Apr 22, 2023 at 4:45 AM gene heskett 
> > wrote:
> > >
> > >> 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 commit.
> > >> fatal: Exiting because of an unresolved conflict.
> > >> pi@rpi4:/media/pi/workspace/bullseye-linuxcnc $ git merge
> > >> error: Merging 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 commit.
> > >> fatal: Exiting because of an unresolved conflict.
> > >>
> > >> Fix?
> > >>
> > >> Thanks,
> > >>
> > >> 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 
> > >>
> > >>
> > >> ___
> > >> Emc-developers mailing list
> > >> Emc-developers@lists.sourceforge.net
> > >> https://lists.sourceforge.net/lists/listinfo/emc-developers
> > >>
> > >
> > > ___
> > > 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
> > Genes Web page 
> >
> >
> >
> > ___
> > Emc-developers mailing list
> > Emc-developers@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/emc-developers
> >
> 
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers
>


___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] my copy of bullseye git repo needs a hardreset, but its not in git manual, howto?

[Greg C]

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 have any
changes  this step isn’t necessary).

gif stash pop

And your changes would be put back.  I’m not sure what you changed.

If you may have added new files then you need “git stash -u” for the first
stanza.



On Sat, Apr 22, 2023 at 11:23 AM gene heskett  wrote:

> 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 merge
> lib/python/gladevcp/drowidget.py: needs merge
> src/po/es.po: needs merge
> src/po/gmoccapy/cs.po: needs merge
> src/po/gmoccapy/es.po: needs merge
> src/po/gmoccapy/tr.po: needs merge
> src/po/tr.po: needs merge
> error: cannot rebase: You have unstaged changes.
> error: additionally, your index contains uncommitted changes.
> error: Please commit or stash them.
>
> my cron scripts only do git pulls, I haven't touched it in yonks.
>
> > 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.
>
> I had to do that a couple years back.  Its not a showstopper as buster
> is running it fine, but the buildbot may be hung again, I've had wintel
> updates but not armhf's for a few days.  Have fun if you re going to the
> meeting. This can wait.
> >
> > -Greg
> >
> > On Sat, Apr 22, 2023 at 4:45 AM gene heskett 
> wrote:
> >
> >> 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 commit.
> >> fatal: Exiting because of an unresolved conflict.
> >> pi@rpi4:/media/pi/workspace/bullseye-linuxcnc $ git merge
> >> error: Merging 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 commit.
> >> fatal: Exiting because of an unresolved conflict.
> >>
> >> Fix?
> >>
> >> Thanks,
> >>
> >> 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 
> >>
> >>
> >> ___
> >> Emc-developers mailing list
> >> Emc-developers@lists.sourceforge.net
> >> https://lists.sourceforge.net/lists/listinfo/emc-developers
> >>
> >
> > ___
> > 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
> Genes Web page 
>
>
>
> ___
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers
>

___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] my copy of bullseye git repo needs a hardreset, but its not in git manual, howto?

[gene heskett]

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 merge
lib/python/gladevcp/drowidget.py: needs merge
src/po/es.po: needs merge
src/po/gmoccapy/cs.po: needs merge
src/po/gmoccapy/es.po: needs merge
src/po/gmoccapy/tr.po: needs merge
src/po/tr.po: needs merge
error: cannot rebase: You have unstaged changes.
error: additionally, your index contains uncommitted changes.
error: Please commit or stash them.

my cron scripts only do git pulls, I haven't touched it in yonks.


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.


I had to do that a couple years back.  Its not a showstopper as buster 
is running it fine, but the buildbot may be hung again, I've had wintel 
updates but not armhf's for a few days.  Have fun if you re going to the 
meeting. This can wait.


-Greg

On Sat, Apr 22, 2023 at 4:45 AM gene heskett  wrote:


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 commit.
fatal: Exiting because of an unresolved conflict.
pi@rpi4:/media/pi/workspace/bullseye-linuxcnc $ git merge
error: Merging 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 commit.
fatal: Exiting because of an unresolved conflict.

Fix?

Thanks,

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 


___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers



___
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
Genes Web page 



___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Re: [Emc-developers] my copy of bullseye git repo needs a hardreset, but its not in git manual, howto?

[gene heskett]

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:
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 



___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers