Jump to content

Interesting GIT BRANCHES


Guest AuntieMangos

Recommended Posts

  • Replies 105
  • Created
  • Last Reply

Top Posters In This Topic

Try:

git pull git://github.com/Gigelf/mangos.git auctionhouse

I have been using Gigelf's and works great

I am running:

Mangos: rev. 7903, SD2 1106, Acid 0.1.0 Using DB: UDB 0.11.5 (380) for MaNGOS 7894 with SD2 SQL for rev. 1106

Link to comment
Share on other sites

  • 2 months later...
  • 5 weeks later...
  • 2 weeks later...
What's the git for the 320 testbranch ?

Maybe you should first learn how GIT works before trying to do custom stuff. Mostly Freghar and Wyk3d have made a very informational section here on mangos forum called: Source Code Management.

Give that section a visit and find out how to change branches ^_^

Link to comment
Share on other sites

  • 4 weeks later...

I can not run, I'm wrong?, what I'm doing?

I presents conflicts between

there is the correct sequence, please

git checkout -b anticheat

git pull git://github.com/kaxias/mangos.git anticheat

git checkout -b simple_jail

git pull git://github.com/dythzer/mangos.git simple_jail

git checkout -b chatlog

git pull git://github.com/imalcolm/mangos.git chatlog

git checkout -b ahbot

git pull git://github.com/Naicisum/mangos.git ahbot

git checkout -b mangchat

git pull git://github.com/shinzon/mangos.git mangchat

Link to comment
Share on other sites

darky88 thanks for answering.

I am willing to work, not giving away my work.

unfortunately do not have the knowledge to determine manually merge.

so I have some questions

working on centos linux x32

Is there any command or application for such work?

Do I have to take the diff of the referenced working version to version of the patch to make a pure merge?

thanks

translated by google (Spanish)

Link to comment
Share on other sites

×
×
  • Create New...

Important Information

We have placed cookies on your device to help make this website better. You can adjust your cookie settings, otherwise we'll assume you're okay to continue. Privacy Policy Terms of Use