> > Per my subject line, sorry for my ignorance and thread-jacking, but I'm also
> > experiencing an issue with the MSYS64 build environment but it's related to GIT.
> >
> > Under the previous build tools, I after cloning the repository from scratch I ran
> the
> > update command of "git pull https://github.com/mamedev/mame.git%22%22 to update to
> the
> > latest commit. This seems to work the first time I run it, but on the second try I
> > get a merge error related to "README.md" in the base of the repository.
> >
> > Any guidance on remedying this issue would be much appreciated.
> >
> >
> > Edit - Here is what I'm seeing. Possible timestamp/timezone differential issue?
> Looks
> > like it's expecting me to commit although I've changed nothing.
> > $ git pull [url=https://github.com/mamedev/mame.git"
> target="_blank">https://github.com/mamedev/mame.git
> > warning: no common commits
> > remote: Counting objects: 595225, done.
> > remote: Compressing objects: 100% (15/15), done.
> > remote: Total 595225 (delta 4), reused 0 (delta 0), pack-reused 595210
> > Receiving objects: 100% (595225/595225), 459.78 MiB | 3.11 MiB/s, done.
> > Resolving deltas: 100% (516552/516552), done.
> > From
>
> I had exactly the same problem as you, here is how i fixed it :
>
> First time "git clone https://github.com/mamedev/mame.git " copied the mame folder content in ../.. instead
> of ./mame hence the conflict with the buildtools' readme.md
I saw the same thing with it updating into the root dir and classing with the build tools.
I found the solution. If you "cd mame" in your home folder then run the "git pull https://github.com/mamedev/mame.git " from within the mame source dir, it works as it should.
Edited by Pr3tty F1y (01/13/16 03:27 AM)
|
Index 
Flat 
Re: Pardon my ignorance and sorry for thread-jacking
Reply
