search

Seejayz / WorldofwarcraftArmory

The World of Warcraft Armory is a vast searchable database of information for World of Warcraft - taken straight from the real servers and presented in a user-friendly interface. Since the Armory pulls its data from the actual game servers, it is the most comprehensive and up-to-date database on the characters, arena teams, guilds, and items of World of Warcraft in existence.
GNU General Public License v3.0
19 stars 18 forks source link

Patch Error #5

Open lasoto opened 12 years ago

lasoto commented 12 years ago

Used GitExtension Error Code.

fatal: sha1 information is lacking or useless (src/server/game/Achievements/AchievementMgr.cpp). Done Applying: Armory Patch Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Armory Patch When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort".

Takenbacon commented 12 years ago

The patch is extremely old, just manually apply it, its not hard at all.

microonline commented 12 years ago

add it manually is annoying.

still, does not work after fix manually. the creator should at least fix that.