jmanjulian

Yes i managed to figure it out. Just had to delete comment git stuff from the new function and add a missinfg "}" to it.

Following this guid i did:

balrok.sh

git clone  git://github.com/mangos/mangos.git source
cd source
git pull origin master
git remote add balrok git://github.com/balrok/mangos.git
git pull balrok arena

Result was:

jman@jman-ubuntu:/media/mangos$ ./balrok.sh
Initialized empty Git repository in /media/mangos/source/.git/
remote: Counting objects: 5616, done.
remote: Compressing objects: 100% (4511/4511), done.
remote: Total 5616 (delta 2449), reused 3879 (delta 1058)
Receiving objects: 100% (5616/5616), 14.88 MiB | 285 KiB/s, done.
Resolving deltas: 100% (2449/2449), done.
Checking out files: 100% (3368/3368), done.
From git://github.com/mangos/mangos
* branch            master     -> FETCH_HEAD
Already up-to-date.
remote: Counting objects: 197, done.
remote: Compressing objects: 100% (76/76), done.
remote: Total 103 (delta 87), reused 36 (delta 27)
Receiving objects: 100% (103/103), 218.43 KiB | 97 KiB/s, done.
Resolving deltas: 100% (87/87), completed with 51 local objects.
From git://github.com/balrok/mangos
* branch            arena      -> FETCH_HEAD
Auto-merged src/game/BattleGround.cpp
Auto-merged src/game/BattleGroundBE.cpp
Auto-merged src/game/BattleGroundEY.cpp
Auto-merged src/game/BattleGroundMgr.cpp
Auto-merged src/game/BattleGroundRL.cpp
Auto-merged src/game/BattleGroundWS.cpp
Auto-merged src/game/CharacterHandler.cpp
Auto-merged src/game/Chat.cpp
Auto-merged src/game/Chat.h
Auto-merged src/game/Language.h
Auto-merged src/game/Level3.cpp
CONFLICT (content): Merge conflict in src/game/Level3.cpp
Auto-merged src/game/MiscHandler.cpp
Auto-merged src/game/Player.cpp
Auto-merged src/game/Player.h
Auto-merged src/game/SpellEffects.cpp
Auto-merged src/game/Unit.cpp
Auto-merged src/game/Unit.h
Auto-merged src/game/World.cpp
Auto-merged src/game/debugcmds.cpp
Auto-merged src/mangosd/mangosd.conf.dist.in
Automatic merge failed; fix conflicts and then commit the result.
jman@jman-ubuntu:/media/mangos$ 

Merge problems = branch not updated am i right?

If i am how do i solve conflick manually? I need to know where are the pach files containing the new code stored bu git so that i can open them and copy paste all new code by hand?

What was pre problem with proxifier it usually channels all network traffik even if the software you want to use does not support proxy in ani way.

Yes thanks http://repo.or.cz/r/getmangos.git works good no transfer errors here, but is this an uptodate clone of the main mangos repository? I mean if today there is a new commit to mangos main brach will it be in this one too at te same time?

git:// does not go through proxy so http is required

I have this error when i try to clone git repository through http portokol.

error: Unable to find ab3e98e597b1e280bad3d430696fea918dd9b0cb under http://github.com/mangos/mangos.git

Cannot obtain needed blob ab3e98e597b1e280bad3d430696fea918dd9b0cb

Before 2 days it worked good but today it gives this error by clone and also if i try to update tith pull.

This is the command i sue to clone. As I said it worked 2 days ago, so is the problem by me or in the mangos repository?

git clone http://github.com/mangos/mangos.git

I'm using Ubuntu 8.04.1

I have a question. Does the git repository system have something like svn revision numbering. I mean how can i see what revision im compiling? And does it have a changelog and if it does what are the commands to display it? Im using linux.

P.S sorry found answer delete post please.