Jump to content

all mobs disappears


paner

Recommended Posts

git cherry-pick -n 1ae9b1eaf

this command doesen't work because appears this message:

Automatic cherry-pick failed.  After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>'
and commit the result with:

       git commit -c 1ae9b1eaf75141ff33998a94f10ef0f902f50afd

and the command before force to rev 11221 not 11222

Link to comment
Share on other sites

11222 is the commit that probably caused the problem - we need to use something before then to see if it was working before that

To resolve the cherry-pick conflict, edit src/shared/revision_nr.h

It needs to look like this:

#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "11234"
#endif // __REVISION_NR_H__

You don't need to commit afterward, because you will want to discard these changes later in order to pull from mangos master again.

Link to comment
Share on other sites

ok!

i have edited the file and i have this inside:

#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
<<<<<<< HEAD
#define REVISION_NR "11221"
=======
#define REVISION_NR "11234"
>>>>>>> 1ae9b1e... [11234] Fixed typo in .debug spellcoefs help string.
#endif // __REVISION_NR_H__

Link to comment
Share on other sites

now cherry-pic give me this:

src/shared/revision_nr.h: unmerged (a37f2170c976fb292ac8cafc6ec08ac17b17af20)
src/shared/revision_nr.h: unmerged (c97f4499d0b85ef70515191f5033dad44074555c)
src/shared/revision_nr.h: unmerged (66e1e17da87652a46e57068a1702a094e2da0c84)
fatal: Your index file is unmerged.

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