Welcome to AC Web.
Results 1 to 6 of 6
  1. #1

    [ElunaLuaEngine]How-to


    REGISTER! (FREE)
    Registered members see less ads
    and also gain access to other great features.
    Hello, dear Community.
    Would you tell me how can I add ElunaLuaEngine to CMaNGOS? And yes, I know that there is already
    CMaNGOS with Eluna called
    ElunaMangosTbc, but it's outdated. I posted a thread months ago and someone told me that I have to
    add it manually and here the question comes, how can I add ElunaLuaEngine to CManGOS "Manually", thanks.

    Regards,
    Deep Sky.

  2. #2

  3. #3

  4. #4
    Quote Originally Posted by Blake Barraclough View Post
    Thanks, it doesn't work, there are conflicts:

    "Automatic merge failed; fix conflicts and then commit the result."
    "error: Pulling is not possible because you have unmerged files."
    "hint: Fix them up in the work tree, and then use 'git add/rm <file>'"
    "hint: as appropriate to mark resolution and make a commit."
    "fatal: Exiting because of an unresolved conflict."
    "fatal: refusing to merge unrelated histories"

    How can I fix it?
    Last edited by Deep Sky; 10-12-2017 at 06:49 PM.

  5. #5
    You should ask rochet2 to merge or fix the conflicts then because he is one of the active eluna developers at this moment

  6. #6
    weird like that

    Join Date
    Feb 2010
    Location
    http://rochet2.github.io/
    Posts
    5,105

    REGISTER! (FREE)
    Registered members see less ads
    and also gain access to other great features.

 

 

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •