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

[Greg C]

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

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

[andy pugh]

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

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

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

[gene heskett]

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