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

[Steffen M. <ste...@gm...>]

git reset --hard

??

Steffen

> Gesendet: Samstag, 22. April 2023 um 17:36 Uhr
> Von: "Greg C" <gre...@gm...>
> An: "EMC developers" <emc...@li...>
> 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 <ghe...@sh...> 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 <ghe...@sh...>
> > 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 <file>'
> > >> 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 <file>'
> > >> 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 <http://geneslinuxbox.net:6309/>
> > >>
> > >>
> > >> _______________________________________________
> > >> Emc-developers mailing list
> > >> Emc...@li...
> > >> https://lists.sourceforge.net/lists/listinfo/emc-developers
> > >>
> > >
> > > _______________________________________________
> > > Emc-developers mailing list
> > > Emc...@li...
> > > 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 <http://geneslinuxbox.net:6309/>
> >
> >
> >
> > _______________________________________________
> > Emc-developers mailing list
> > Emc...@li...
> > https://lists.sourceforge.net/lists/listinfo/emc-developers
> >
> 
> _______________________________________________
> Emc-developers mailing list
> Emc...@li...
> https://lists.sourceforge.net/lists/listinfo/emc-developers
>