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" 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.
Code:
$ git pull 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 https://github.com/mamedev/mame
* branch HEAD -> FETCH_HEAD
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging .gitattributes
CONFLICT (add/add): Merge conflict in .gitattributes
Automatic merge failed; fix conflicts and then commit the result.
Edited by Pr3tty F1y (01/05/16 06:38 PM)
|
Index 
Flat 
Pardon my ignorance and sorry for thread-jacking
Reply
