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 <ghesk...@shentel.net> 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-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
