pcquad

git pull git://github.com/balrok/mangos.git alterac
U       src/game/Chat.cpp
U       src/game/Chat.h
U       src/game/GroupHandler.cpp
U       src/game/Level2.cpp
M       src/game/Player.h
U       src/game/Spell.cpp
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.

what does that mean and what do i exactly have to do now?

tried:

:~/mangos/src/game# git add src/gamechat.ccp
fatal: pathspec 'src/game/src/gamechat.ccp' did not match any files

As the title says, how can I apply a patch in ubuntu 11.04.

Is there any tutorial out? Because I couldn't find one , neither in google nor here.

Here are some main questions :

1)Do I have like copying the .patch file into the mangos source folder and then recompile everything?

1.1)if yes is there a easier way to do that?

2)Is there a command I can for example type in the mangos CLI for using a patch that will be activated after restart?

I know you'll probably tell me to use the search correctly, but I want to write my own patches and I have almost no knowledge about manGOS.

Help is really appreciated.

~Pcquad

And, generally your account name can't resemble an email address

What do you mean with that?

okay thank you guys , unfortunately I deleted my WOW folder , im installing it currently again -.-'

but im trying then

hm i dont think so, i actually can login , after that the message appears.

Also i edited the realmlist.wtf

Blizzard servers don't require correct login information to apply client patches.

oh I didnt know , but tell me then what have i done wrong , that it does not conenct ot my server ?

i edited my realm like this:

set realm mycodeboard.com

hm i dont think so, i actually can login , after that the message appears.

Also i edited the realmlist.wtf

Hey,

I recently installed Mangos on my Ubuntu Server, it was hell of a work to get it running, no everything seems fine , except the fact

that i can't connect to my server , it says that my wow client version would be too old and I should patch it.

But the version of my wow client is 3.3.5.12340 and my mangos version supports exactly the same version (shareddefines.h).

Could the problem be that I have a german client and english maps/vmaps/dbc?