Obtaining Hercules

[Triedge]

Updating 649e7b9..ba5ca9e
error: Your local changes to the following files would be overwritten by merge:
src/common/mmo.h
Please, commit your changes or stash them before you can merge.
Aborting

 

[jaBote]

Updating 649e7b9..ba5ca9e

error: Your local changes to the following files would be overwritten by merge:

src/common/mmo.h

Please, commit your changes or stash them before you can merge.

Aborting

Your answer is here:

Git Troubleshooting​

Please, commit your changes or stash them before you can merge.Aborting.Git doesn't update modified files even if they don't conflict unless they're properly "committed" in your local working copy, to do so is simple and advantageous (it will keep a log of your changes for yourself; so you can always go back and check what was changed and when)- On Unix

git commit -am "your log message, anything at all"
- On Windows1. Right click your folder -> Git Commit -> "master"

2. (optional) type the log message

3. Hit 'OK'

Then update normally.

 

[Triedge]

Message:

User name and email must be set before commit.

Do you want set these now.

Option: Yes.

...no understand nothing.

 

[jaBote]

Prior to committing, you should have set up your git username and email (they can be fake ones if you want) so that your commits can be identified:

on Linux:

git config --global user.name "Your username"git config --global user.email [email protected]

 

[Zezicla]

is it correct that with git you can let it update your own src that has modified work and let those still remain but do update to new rev?
that svn whont do ??

 

[jaBote]

yeah, unless you get update conflicts. In that case you'll have to resolve them manually.

 

[Triedge]

Prior to committing, you should have set up your git username and email (they can be fake ones if you want) so that your commits can be identified:

on Linux:

git config --global user.name "Your username"git config --global user.email [email protected]

No se como o que hice (empece a darle click a cada opcion), pero ya me funciona.

Gracias y disculpa las molestias.

 

[Mhalicot]

Prior to committing, you should have set up your git username and email (they can be fake ones if you want) so that your commits can be identified:

on Linux:

git config --global user.name "Your username"git config --global user.email [email protected]

No se como o que hice (empece a darle click a cada opcion), pero ya me funciona.

Gracias y disculpa las molestias.

Please use English language, Its okay if its not your native language just give it a try..

 

[Angelmelody]

if my current git hash is 385e1e5 and want to upgrade to 972caf2 , I don't wanna  pull all commits  at a time

Tortoisesvn can did by update to revison , but Tortoisegit how to?

 

[jaBote]

Fastest way I can think about it is just updating to last revision, then locally on your repository get the revision you'll be using.

 

[GM.PiXeL]

how to checkout only the master branch.

not all branches?

 

[kisuka]

how to checkout only the master branch.

not all branches?

git clone -b master --single-branch https://github.com/HerculesWS/Hercules

 

[GM.PiXeL]

how to checkout only the master branch.

not all branches?

git clone -b master --single-branch https://github.com/HerculesWS/Hercules

Im using tortoise SVN.

 

[Angelmelody]

Fastest way I can think about it is just updating to last revision, then locally on your repository get the revision you'll be using.

 I don't get it!

 

[Cedric.Chan]

Thank you. It's working now.!!

 

[iZeal]

How do I get old version?

 

[kisuka]

How do I get old version?

In your master branch do the following:

​git checkout -b mybranch <sha1 / commit you want>

example:

git checkout -b cantthinkofbranchname 254f47e

 

[iZeal]

on the Console I'm using windows by the way

Ill try this Thank you

 

[kisuka]

on the Console I'm using windows by the way

Ill try this Thank you

Should work fine in git bash. Try to stay away from the GUI. Get used to doing the command line / bash version. It's much easier / faster.

 

[iZeal]

on the Console I'm using windows by the way

Ill try this Thank you

Should work fine in git bash. Try to stay away from the GUI. Get used to doing the command line / bash version. It's much easier / faster.

Thanks for your help kisuka, one problem also when I try to use "git pull" to update version I always get this message:

[theuser@hotdog git]$ git pull
You are not currently on a branch, so I cannot use any
'branch.<branchname>.merge' in your configuration file.
Please specify which remote branch you want to use on the command
line and try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.