User Tools

Site Tools


Exception: Git command failed to perform periodic pull: error: Your local changes to the following files would be overwritten by merge: pages/cn/rpd/acidic_scorpio_mob.txt pages/cn/rpd/air_elemental_mob.txt pages/cn/rpd/bone_saw_item.txt pages/cn/rpd/boomerang_item.txt pages/cn/rpd/calm_spell.txt pages/cn/rpd/chaos_armor_item.txt pages/cn/rpd/chaos_bow_item.txt pages/cn/rpd/chaos_crystal_item.txt pages/cn/rpd/chaos_set.txt pages/cn/rpd/chaos_sword_item.txt pages/cn/rpd/common_arrow_item.txt pages/cn/rpd/eye_mob.txt pages/cn/rpd/fire_elemental_mob.txt pages/cn/rpd/gnolls.txt pages/cn/rpd/guardian_subclass.txt pages/cn/rpd/halls_level.txt pages/cn/rpd/heal_spell.txt pages/cn/rpd/herbalism.txt pages/cn/rpd/human_mob.txt pages/cn/rpd/kunai_throw_spell.txt pages/cn/rpd/lightning_trap.txt pages/cn/rpd/melee_mechanic.txt pages/cn/rpd/mobs.txt pages/cn/rpd/monk_mob.txt pages/cn/rpd/paralysis_arrow_item.txt pages/cn/rpd/piranha_mob.txt pages/cn/rpd/plague_doctor_affinity.txt pages/cn/rpd/potion_of_might_item.txt pages/cn/rpd/potion_of_purity_item.txt pages/cn/rpd/priest_class.txt pages/cn/rpd/pumpkin_pie_item.txt pages/cn/rpd/ranged_enemies.txt pages/cn/rpd/ration_item.txt pages/cn/rpd/raw_fish_item.txt pages/cn/rpd/regeneration_buff.txt pages/cn/rpd/ring_of_frost_item.txt pages/cn/rpd/rotten_ration_item.txt pages/cn/rpd/ruby_bow_item.txt pages/cn/rpd/shaman_mob.txt pages/cn/rpd/skeleton_mob.txt pages/cn/rpd/start.txt pages/cn/rpd/stone_walking_buff.txt pages/cn/rpd/warlock_mob.txt pages/cn/rpd/warrior_armor_item.txt pages/cn/rpd/warrior_class.txt pages/cn/rpd/warrior_subclass.txt pages/en/rpd/6_tier_weapons.txt pages/en/rpd/accessories.txt pages/en/rpd/accuracy_mechanic.txt pages/en/rpd/acidic_scorpio_mob.txt pages/en/rpd/affinities_mechanic.txt pages/en/rpd/ai_behavior_mechanic.txt pages/en/rpd/air_elemental_mob.txt pages/en/rpd/albino_rat_mob.txt pages/en/rpd/alchemy.txt pages/en/rpd/alchemy_mechanic.txt pages/en/rpd/allies.txt pages/en/rpd/ammo.txt pages/en/rpd/amok_arrow_item.txt pages/en/rpd/amok_buff.txt pages/en/rpd/amok_dart_item.txt pages/en/rpd/amulet_of_yendor_item.txt pages/en/rpd/ankh_item.txt pages/en/rpd/armor_class.txt pages/en/rpd/armor_durability.txt pages/en/rpd/armor_item.txt pages/en/rpd/armor_kit_item.txt pages/en/rpd/armor_mechanic.txt pages/en/rpd/armor_tiers.txt pages/en/rpd/armor_upgrades_mechanic.txt pages/en/rpd/arrows_item.txt pages/en/rpd/artifacts.txt pages/en/rpd/artificer_npc.txt pages/en/rpd/arts_by_yuila_kozlova.txt pages/en/rpd/assassin_armor_item.txt pages/en/rpd/assassin_subclass.txt pages/en/rpd/attack_skill_mechanic.txt pages/en/rpd/axes_item.txt pages/en/rpd/azuterron_npc.txt pages/en/rpd/backpack.txt pages/en/rpd/backstab_spell.txt pages/en/rpd/badge_spider_queen_slain.txt pages/en/rpd/badges.txt pages/en/rpd/ballistica_mechanic.txt pages/en/rpd/bandit_mob.txt pages/en/rpd/bard_npc.txt pages/en/rpd/barkskin_buff.txt pages/en/rpd/barrel_level_object.txt pages/en/rpd/bat_mob.txt pages/en/rpd/battle_axe_item.txt pages/en/rpd/battle_mage_armor_item.txt pages/en/rpd/battle_mage_subclass.txt pages/en/rpd/beehive_mob.txt pages/en/rpd/belongings.txt pages/en/rpd/belongings_mechanic.txt pages/en/rpd/berserker_armor_item.txt pages/en/rpd/berserker_subclass.txt pages/en/rpd/bishop_npc.txt pages/en/rpd/black_rat_mob.txt pages/en/rpd/black_skull_item.txt pages/en/rpd/blacksmith_npc.txt pages/en/rpd/blank_scroll_item.txt pages/en/rpd/blessed_buff.txt pages/en/rpd/blindness_buff.txt pages/en/rpd/body_armor_spell.txt pages/en/rpd/bombs.txt pages/en/rpd/bone_saw_item.txt pages/en/rpd/boomerang_item.txt pages/en/rpd/boss_badges.txt pages/en/rpd/bosses.txt pages/en/rpd/bosses_mechanic.txt pages/en/rpd/bow_item.txt pages/en/rpd/bows_and_arrows_item.txt pages/en/rpd/bows_crossbows_arrows.txt pages/en/rpd/brute_mob.txt pages/en/rpd/buff.txt pages/en/rpd/buffs.txt pages/en/rpd/burning_buff.txt pages/en/rpd/burning_fist_mob.txt pages/en/rpd/caged_kobold_message1.txt pages/en/rpd/caged_kobold_message2.txt pages/en/rpd/caged_kobold_message3.txt p Aborting

Exception: Git command failed to perform periodic pull: error: Your local changes to the following files would be overwritten by merge: pages/cn/rpd/acidic_scorpio_mob.txt pages/cn/rpd/air_elemental_mob.txt pages/cn/rpd/bone_saw_item.txt pages/cn/rpd/boomerang_item.txt pages/cn/rpd/calm_spell.txt pages/cn/rpd/chaos_armor_item.txt pages/cn/rpd/chaos_bow_item.txt pages/cn/rpd/chaos_crystal_item.txt pages/cn/rpd/chaos_set.txt pages/cn/rpd/chaos_sword_item.txt pages/cn/rpd/common_arrow_item.txt pages/cn/rpd/eye_mob.txt pages/cn/rpd/fire_elemental_mob.txt pages/cn/rpd/gnolls.txt pages/cn/rpd/guardian_subclass.txt pages/cn/rpd/halls_level.txt pages/cn/rpd/heal_spell.txt pages/cn/rpd/herbalism.txt pages/cn/rpd/human_mob.txt pages/cn/rpd/kunai_throw_spell.txt pages/cn/rpd/lightning_trap.txt pages/cn/rpd/melee_mechanic.txt pages/cn/rpd/mobs.txt pages/cn/rpd/monk_mob.txt pages/cn/rpd/paralysis_arrow_item.txt pages/cn/rpd/piranha_mob.txt pages/cn/rpd/plague_doctor_affinity.txt pages/cn/rpd/potion_of_might_item.txt pages/cn/rpd/potion_of_purity_item.txt pages/cn/rpd/priest_class.txt pages/cn/rpd/pumpkin_pie_item.txt pages/cn/rpd/ranged_enemies.txt pages/cn/rpd/ration_item.txt pages/cn/rpd/raw_fish_item.txt pages/cn/rpd/regeneration_buff.txt pages/cn/rpd/ring_of_frost_item.txt pages/cn/rpd/rotten_ration_item.txt pages/cn/rpd/ruby_bow_item.txt pages/cn/rpd/shaman_mob.txt pages/cn/rpd/skeleton_mob.txt pages/cn/rpd/start.txt pages/cn/rpd/stone_walking_buff.txt pages/cn/rpd/warlock_mob.txt pages/cn/rpd/warrior_armor_item.txt pages/cn/rpd/warrior_class.txt pages/cn/rpd/warrior_subclass.txt pages/en/rpd/6_tier_weapons.txt pages/en/rpd/accessories.txt pages/en/rpd/accuracy_mechanic.txt pages/en/rpd/acidic_scorpio_mob.txt pages/en/rpd/affinities_mechanic.txt pages/en/rpd/ai_behavior_mechanic.txt pages/en/rpd/air_elemental_mob.txt pages/en/rpd/albino_rat_mob.txt pages/en/rpd/alchemy.txt pages/en/rpd/alchemy_mechanic.txt pages/en/rpd/allies.txt pages/en/rpd/ammo.txt pages/en/rpd/amok_arrow_item.txt pages/en/rpd/amok_buff.txt pages/en/rpd/amok_dart_item.txt pages/en/rpd/amulet_of_yendor_item.txt pages/en/rpd/ankh_item.txt pages/en/rpd/armor_class.txt pages/en/rpd/armor_durability.txt pages/en/rpd/armor_item.txt pages/en/rpd/armor_kit_item.txt pages/en/rpd/armor_mechanic.txt pages/en/rpd/armor_tiers.txt pages/en/rpd/armor_upgrades_mechanic.txt pages/en/rpd/arrows_item.txt pages/en/rpd/artifacts.txt pages/en/rpd/artificer_npc.txt pages/en/rpd/arts_by_yuila_kozlova.txt pages/en/rpd/assassin_armor_item.txt pages/en/rpd/assassin_subclass.txt pages/en/rpd/attack_skill_mechanic.txt pages/en/rpd/axes_item.txt pages/en/rpd/azuterron_npc.txt pages/en/rpd/backpack.txt pages/en/rpd/backstab_spell.txt pages/en/rpd/badge_spider_queen_slain.txt pages/en/rpd/badges.txt pages/en/rpd/ballistica_mechanic.txt pages/en/rpd/bandit_mob.txt pages/en/rpd/bard_npc.txt pages/en/rpd/barkskin_buff.txt pages/en/rpd/barrel_level_object.txt pages/en/rpd/bat_mob.txt pages/en/rpd/battle_axe_item.txt pages/en/rpd/battle_mage_armor_item.txt pages/en/rpd/battle_mage_subclass.txt pages/en/rpd/beehive_mob.txt pages/en/rpd/belongings.txt pages/en/rpd/belongings_mechanic.txt pages/en/rpd/berserker_armor_item.txt pages/en/rpd/berserker_subclass.txt pages/en/rpd/bishop_npc.txt pages/en/rpd/black_rat_mob.txt pages/en/rpd/black_skull_item.txt pages/en/rpd/blacksmith_npc.txt pages/en/rpd/blank_scroll_item.txt pages/en/rpd/blessed_buff.txt pages/en/rpd/blindness_buff.txt pages/en/rpd/body_armor_spell.txt pages/en/rpd/bombs.txt pages/en/rpd/bone_saw_item.txt pages/en/rpd/boomerang_item.txt pages/en/rpd/boss_badges.txt pages/en/rpd/bosses.txt pages/en/rpd/bosses_mechanic.txt pages/en/rpd/bow_item.txt pages/en/rpd/bows_and_arrows_item.txt pages/en/rpd/bows_crossbows_arrows.txt pages/en/rpd/brute_mob.txt pages/en/rpd/buff.txt pages/en/rpd/buffs.txt pages/en/rpd/burning_buff.txt pages/en/rpd/burning_fist_mob.txt pages/en/rpd/caged_kobold_message1.txt pages/en/rpd/caged_kobold_message2.txt pages/en/rpd/caged_kobold_message3.txt p Aborting

An unforeseen error has occured. This is most likely a bug somewhere. It might be a problem in the gitbacked plugin.

More info has been written to the DokuWiki error log.