Jump to content

KevinsComputer

Members
  • Posts

    4
  • Joined

  • Last visited

    Never
  • Donations

    0.00 GBP 

Posts posted by KevinsComputer

  1. Is this okay or is something going wrong ?

    X@X:~$ cd Desktop

    X@X:~/Desktop$ mkdir mangos_tbc_stable

    X@X:~/Desktop$ cd mangos_tbc_stable

    X@X:~/Desktop/mangos_tbc_stable$ git pull origin mangos-0.12

    fatal: Not a git repository

    Failed to find a valid git directory.

    X@X:~/Desktop/mangos_tbc_stable$ git clone git://github.com/mangos/mangos.git

    Initialized empty Git repository in /home/X/Desktop/mangos_tbc_stable/mangos/.git/

    remote: Counting objects: 9674, done.

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

    remote: Total 9674 (delta 6001), reused 8699 (delta 5050)

    Receiving objects: 100% (9674/9674), 16.47 MiB | 2030 KiB/s, done.

    Resolving deltas: 100% (6001/6001), done.

    X@X:~/Desktop/mangos_tbc_stable$ git pull origin mangos-0.12

    fatal: Not a git repository

    Failed to find a valid git directory.

    X@X:~/Desktop/mangos_tbc_stable$ dir

    mangos

    X@X:~/Desktop/mangos_tbc_stable$ cd mangos

    X@X:~/Desktop/mangos_tbc_stable/mangos$ git pull origin mangos-0.12

    Auto-merged sql/mangos.sql

    Auto-merged sql/updates/6939_01_mangos_quest_template.sql

    CONFLICT (add/add): Merge conflict in sql/updates/6939_01_mangos_quest_template.sql

    Auto-merged sql/updates/Makefile.am

    CONFLICT (content): Merge conflict in sql/updates/Makefile.am

    Auto-merged src/game/MapManager.cpp

    Auto-merged src/game/Player.cpp

    Auto-merged src/shared/revision_nr.h

    CONFLICT (content): Merge conflict in src/shared/revision_nr.h

    Automatic merge failed; fix conflicts and then commit the result.

    X@X:~/Desktop/mangos_tbc_stable/mangos$

    EDIT:

    I get compiling errors too.

×
×
  • 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