|
Error with "git pull" - syntax?
#348990 - 01/07/16 06:33 PM
|
|
|
I tried running "git pull" and got this response:
Code:
$ git pull
remote: Counting objects: 16, done.
remote: Compressing objects: 100% (10/10), done.
remote: Total 16 (delta 6), reused 13 (delta 3), pack-reused 0
Unpacking objects: 100% (16/16), done.
From https://github.com/mamedev/buildtools_x64
4e55b99..6eba791 master -> origin/master
Updating 4e55b99..6eba791
error: Your local changes to the following files would be overwritten by merge:
win32/env.bat
Please, commit your changes or stash them before you can merge.
Aborting
I have made no changes to "win32/env.bat." I can't commit them. I don't know how to "stash" them. What is the syntax to override this environment protection, and make "git pull" override local changes? Is it --rebase?
|
|
|
|
Re: Error with "git pull" - syntax?
[Re: Zaghadka]
#348993 - 01/07/16 06:40 PM
|
|
|
Okay. Sorry for the noise. I figured it out on my own.
I had to run git stash first, after identifying my identity to the repository.
Did that "stash" put something onto the servers? I'm really not a developer, and I don't want to cause unnecessary noise at the MAME project servers.
|
|
|
|
Re: Error with "git pull" - syntax?
[Re: Zaghadka]
#349000 - 01/07/16 08:29 PM
|
|
|
> Okay. Sorry for the noise. I figured it out on my own.
>
> I had to run git stash first, after identifying my identity to the repository.
>
> Did that "stash" put something onto the servers? I'm really not a developer, and I
> don't want to cause unnecessary noise at the MAME project servers.
Oh my god!!! I know have a full folders of your files !!!
No, only joking, you can't push anything on the server unless being a validated contributor 
Edited by remax (01/07/16 08:31 PM)
|
|
|
|
Re: Error with "git pull" - syntax?
[Re: Zaghadka]
#349003 - 01/07/16 09:18 PM
|
|
|
just run:
git config --global core.autocrlf true
and then
git pull
Should be all fine.
|
|
|
|
Re: Error with "git pull" - syntax?
[Re: remax]
#349072 - 01/09/16 01:32 AM
|
|
|
> > Okay. Sorry for the noise. I figured it out on my own.
> >
> > I had to run git stash first, after identifying my identity to the repository.
> >
> > Did that "stash" put something onto the servers? I'm really not a developer, and I
> > don't want to cause unnecessary noise at the MAME project servers.
>
> Oh my god!!! I know have a full folders of your files !!!
>
>
> No, only joking, you can't push anything on the server unless being a validated
> contributor
Very funny, remax. I'm messing with powerful stuff I barely understand. You trying to give me a coronary? LOL.
|
|
|
|
Re: Error with "git pull" - syntax?
[Re: Zaghadka]
#349078 - 01/09/16 04:47 AM
|
|
|
> > > Okay. Sorry for the noise. I figured it out on my own.
> > >
> > > I had to run git stash first, after identifying my identity to the repository.
> > >
> > > Did that "stash" put something onto the servers? I'm really not a developer, and
> I
> > > don't want to cause unnecessary noise at the MAME project servers.
> >
> > Oh my god!!! I know have a full folders of your files !!!
> >
> >
> > No, only joking, you can't push anything on the server unless being a validated
> > contributor
>
> Very funny, remax. I'm messing with powerful stuff I barely understand. You trying to
> give me a coronary? LOL.
Remax got to the heart of your question, so technically, you did get a coronary. 
|
"Note to Noobs:
We are glad to help you but simply posting that something does not work is not going to lead to you getting help. The more information you can supply defining your problem, the less likely it will be that you will get smart-alec replies.
C.D.~"
|
|
Index 
Threaded 
Error with "git pull" - syntax?
Reply
[Re: 
