Git pull problem again ._.

[ToiletMaster 3]

 

error: Your local changes to '3rdparty/libconfig/libconfig.c' would be overwritten by merge.  Aborting.Please, commit your changes or stash them before you can merge.

error: Your local changes to '3rdparty/libconfig/libconfig.c' would be overwritten by merge.  Aborting.Please, commit your changes or stash them before you can merge.

 

Hi there, i'm currently facing issue on git pull.

 

I've never changed the 3rd party/libconfig/libconfig.c before. So i'm not sure what to expect here.

 

What can do i to upadte the files?

[mofo 2]

have you tried...

 

git commit -am "message"

 

if that doesn't work and since you said you didn't change anything with that file you can also try...

 

git checkout 3rd party/libconfig/libconfig.c (fetches an unchanged copy from hercules repo)

or

git add 3rd party/libconfig/libconfig.c (adds the file to the track and makes it safe to merge?)

 

I'm no git expert, so I could be wrong.

[malufett 247]

they to clean up or revert it..

 

[jaBote 438]

If you are sure that file hasn't been changed you can either revert the local changes and try to pull or just commit that and pull anyways.

 

Be sure to have a backup before doing anything, just in case you break something.

 

Or you can use git diff (just that, in the console) to see what is changed on the file. More info: http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository

 

Hope this helps, nobody here is git expert but we'll try to do whatever we can for helping you

[ToiletMaster 3]

  On 6/24/2013 at 11:16 AM, mofo said:

have you tried...

 

git commit -am "message"

 

if that doesn't work and since you said you didn't change anything with that file you can also try...

 

git checkout 3rd party/libconfig/libconfig.c (fetches an unchanged copy from hercules repo)

or

git add 3rd party/libconfig/libconfig.c (adds the file to the track and makes it safe to merge?)

 

I'm no git expert, so I could be wrong.

 

 

Used his method of git add 3rdparty/libconfig/libconfig.c and then git pull

then it works immediately! Thanks again!

[mofo 2]

Glad I could help. =)