Updating Mangos on GIT [Centos]

[aerolite]

Hi! my previous post about updating the server had been deleted without any notice. If I post it in the wrong section please forgive me and tell me.

I'm new in GIT and I don't really know how to update my server using the command line. Can anyone help me please? and do I have to update the sql as well? thank you so much!

[freghar]

Sticky "[Guide] Updating for Windows" in this forum section. Updating for linux should be very similar and maybe it even exists somewhere on the wiki.

[aerolite]

Bro, its similar but its hard to do in Linux because I'm using SSH for Linux which no desktop. I tried to find in Wiki but its on progress http://getmangos.eu/wiki/Updating_For_Linux. Can anyone teach me how to use commands to update?

[Patman128]

Run "git remote show". If don't see origin, run "git remote add origin mangos git://github.com/mangos/mangos.git". Then run "git pull origin master", assuming you are using the master branch, else put in the branch name instead of master.

[aerolite]

Thank you so much! but Patman there's a conlict on my server

# git remote show

Usage: git remote show <remote>

# git remote add origin mangos git://github.com/mangos/mangos.git

Usage: git remote add [-f] [-t track]* [-m master] <name> <url>

# git pull origin master

remote: Counting objects: 1509, done.

remote: Compressing objects: 100% (604/604), done.

Indexing 1372 objects...

remote: Total 1372 (delta 1185), reused 914 (delta 768)

100% (1372/1372) done

Resolving 1185 deltas...

100% (1185/1185) done

125 objects were added to complete this thin pack.

Updating 5fdb9b7..0503742

configure.ac: needs update

src/bindings/Makefile.am: needs update

src/mangosd/Makefile.am: needs update

fatal: Entry 'configure.ac' not uptodate. Cannot merge.

How can Update that?

[Lynx3d]

even though that's among the top5 questions asked:

It means your working copy is modified with respect to HEAD.

If you don't want to keep the changes:

git checkout -f

git pull origin master

or if you want to get rid of any merged commits from other branches too:

git fetch origin

git reset --hard origin/master

[Patman128]

Since it's the ScriptDev2 patch, I'm going to assume he wants to keep them. Just run "git commit -a -m "ScriptDev2 patch." " and then pull.