18:53:26 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_werebeast.txt"
18:53:26 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/b_detail_plan_default.txt
18:53:26 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/body_default.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/body_rcp.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/building_custom.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/c_variation_default.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_amphibians.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_annelids.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_birds.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_birds_new.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_bug_slug_new.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_desert_new.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_domestic.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_equipment.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_fanciful.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_insects.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_mountain.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_ocean.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_riverlake.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_temperate.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_tropical.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_tundra.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_mountain_new.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_next_underground.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_ocean_new.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_other.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_reptiles.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_riverlakepool_new.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_savage_tropical.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_mammal_new.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_mammals.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_ocean.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_riverlake.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_standard.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_subterranean.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_temperate_new.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_tropical_new.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_tundra_taiga_new.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_color_standard.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_pattern_iris_eye.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_pattern_pupil_eye.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_pattern_special.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_shape_standard.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/entity_default.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_metal.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_other.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_gem.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_layer.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_mineral.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_soil.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/interaction_standard.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_ammo.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_armor.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_food.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_gloves.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_helm.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_instrument.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_pants.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_shield.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_shoes.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_siegeammo.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_tool.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_toy.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_trapcomp.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_weapon.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_DWARF.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_ELF.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_GOBLIN.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_HUMAN.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_SYM.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_words.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/material_template_default.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/plant_grasses.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/plant_standard.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/reaction_other.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/reaction_smelter.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/text/book_art.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/text/book_instruction.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/text/secret_death.txt
18:53:27 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/tissue_template_default.txt
18:53:27 | Cmd | sparkleshare.git | git add --all
18:53:27 | Git | sparkleshare.git | Changes staged
18:53:27 | Cmd | sparkleshare.git | git rebase --skip
18:53:27 | Cmd | sparkleshare.git | git status --porcelain
18:53:27 | Cmd | sparkleshare.git | git status --porcelain
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_doren_crittermen.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_example.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_jiripetru_elves.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_kafine_animals.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_magnut_next_underground.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_nwkohaku_animals.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_nwkohaku_birds.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_nwkohaku_bugs.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_animals.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_dwarves.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_goblins.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_humanoids.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_humans.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_procedural.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_sphr_kobolds.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_sphr_monsters.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_disturbance.txt"
18:53:28 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_region.txt"
18:53:28 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_secret.txt"
18:53:28 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_underground_special.txt"
18:53:28 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_vampire.txt"
18:53:28 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_werebeast.txt"
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/b_detail_plan_default.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/body_default.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/body_rcp.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/building_custom.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/c_variation_default.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_amphibians.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_annelids.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_birds.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_birds_new.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_bug_slug_new.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_desert_new.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_domestic.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_equipment.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_fanciful.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_insects.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_mountain.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_ocean.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_riverlake.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_temperate.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_tropical.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_tundra.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_mountain_new.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_next_underground.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_ocean_new.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_other.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_reptiles.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_riverlakepool_new.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_savage_tropical.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_mammal_new.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_mammals.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_ocean.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_riverlake.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_standard.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_subterranean.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_temperate_new.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_tropical_new.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_tundra_taiga_new.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_color_standard.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_pattern_iris_eye.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_pattern_pupil_eye.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_pattern_special.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_shape_standard.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/entity_default.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_metal.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_other.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_gem.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_layer.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_mineral.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_soil.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/interaction_standard.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_ammo.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_armor.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_food.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_gloves.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_helm.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_instrument.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_pants.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_shield.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_shoes.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_siegeammo.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_tool.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_toy.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_trapcomp.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_weapon.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_DWARF.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_ELF.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_GOBLIN.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_HUMAN.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_SYM.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_words.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/material_template_default.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/plant_grasses.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/plant_standard.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/reaction_other.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/reaction_smelter.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/text/book_art.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/text/book_instruction.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/text/secret_death.txt
18:53:28 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/tissue_template_default.txt
18:53:28 | Cmd | sparkleshare.git | git add --all
18:53:28 | Git | sparkleshare.git | Changes staged
18:53:28 | Cmd | sparkleshare.git | git rebase --skip
18:53:28 | Cmd | sparkleshare.git | git status --porcelain
18:53:29 | Cmd | sparkleshare.git | git status --porcelain
18:53:29 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_doren_crittermen.txt
18:53:29 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_example.txt
18:53:29 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_jiripetru_elves.txt
18:53:29 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_kafine_animals.txt
18:53:29 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_magnut_next_underground.txt
18:53:29 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_nwkohaku_animals.txt
18:53:29 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_nwkohaku_birds.txt
18:53:29 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_nwkohaku_bugs.txt
18:53:29 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_animals.txt
18:53:29 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_dwarves.txt
18:53:29 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_goblins.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_humanoids.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_humans.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_procedural.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_sphr_kobolds.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_sphr_monsters.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_disturbance.txt"
18:53:30 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_region.txt"
18:53:30 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_secret.txt"
18:53:30 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_underground_special.txt"
18:53:30 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_vampire.txt"
18:53:30 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_werebeast.txt"
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/b_detail_plan_default.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/body_default.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/body_rcp.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/building_custom.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/c_variation_default.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_amphibians.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_annelids.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_birds.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_birds_new.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_bug_slug_new.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_desert_new.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_domestic.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_equipment.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_fanciful.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_insects.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_mountain.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_ocean.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_riverlake.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_temperate.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_tropical.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_tundra.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_mountain_new.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_next_underground.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_ocean_new.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_other.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_reptiles.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_riverlakepool_new.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_savage_tropical.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_mammal_new.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_mammals.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_ocean.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_riverlake.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_standard.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_subterranean.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_temperate_new.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_tropical_new.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_tundra_taiga_new.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_color_standard.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_pattern_iris_eye.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_pattern_pupil_eye.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_pattern_special.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_shape_standard.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/entity_default.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_metal.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_other.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_gem.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_layer.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_mineral.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_soil.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/interaction_standard.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_ammo.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_armor.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_food.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_gloves.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_helm.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_instrument.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_pants.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_shield.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_shoes.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_siegeammo.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_tool.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_toy.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_trapcomp.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_weapon.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_DWARF.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_ELF.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_GOBLIN.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_HUMAN.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_SYM.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_words.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/material_template_default.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/plant_grasses.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/plant_standard.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/reaction_other.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/reaction_smelter.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/text/book_art.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/text/book_instruction.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/text/secret_death.txt
18:53:30 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/tissue_template_default.txt
18:53:30 | Cmd | sparkleshare.git | git add --all
18:53:30 | Git | sparkleshare.git | Changes staged
18:53:30 | Cmd | sparkleshare.git | git rebase --skip
18:53:30 | Cmd | sparkleshare.git | git status --porcelain
18:53:30 | Cmd | sparkleshare.git | git status --porcelain
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_doren_crittermen.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_example.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_jiripetru_elves.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_kafine_animals.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_magnut_next_underground.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_nwkohaku_animals.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_nwkohaku_birds.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_nwkohaku_bugs.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_animals.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_dwarves.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_goblins.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_humanoids.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_humans.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_procedural.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_sphr_kobolds.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_sphr_monsters.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_disturbance.txt"
18:53:31 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_region.txt"
18:53:31 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_secret.txt"
18:53:31 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_underground_special.txt"
18:53:31 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_vampire.txt"
18:53:31 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_werebeast.txt"
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/b_detail_plan_default.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/body_default.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/body_rcp.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/building_custom.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/c_variation_default.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_amphibians.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_annelids.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_birds.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_birds_new.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_bug_slug_new.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_desert_new.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_domestic.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_equipment.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_fanciful.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_insects.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_mountain.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_ocean.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_riverlake.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_temperate.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_tropical.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_tundra.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_mountain_new.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_next_underground.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_ocean_new.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_other.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_reptiles.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_riverlakepool_new.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_savage_tropical.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_mammal_new.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_mammals.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_ocean.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_riverlake.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_standard.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_subterranean.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_temperate_new.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_tropical_new.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_tundra_taiga_new.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_color_standard.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_pattern_iris_eye.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_pattern_pupil_eye.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_pattern_special.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_shape_standard.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/entity_default.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_metal.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_other.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_gem.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_layer.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_mineral.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_soil.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/interaction_standard.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_ammo.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_armor.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_food.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_gloves.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_helm.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_instrument.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_pants.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_shield.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_shoes.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_siegeammo.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_tool.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_toy.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_trapcomp.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_weapon.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_DWARF.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_ELF.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_GOBLIN.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_HUMAN.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_SYM.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_words.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/material_template_default.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/plant_grasses.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/plant_standard.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/reaction_other.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/reaction_smelter.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/text/book_art.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/text/book_instruction.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/text/secret_death.txt
18:53:31 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/tissue_template_default.txt
18:53:31 | Cmd | sparkleshare.git | git add --all
18:53:31 | Git | sparkleshare.git | Changes staged
18:53:31 | Cmd | sparkleshare.git | git rebase --skip
18:53:31 | Cmd | sparkleshare.git | git status --porcelain
18:53:32 | Cmd | sparkleshare.git | git status --porcelain
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_doren_crittermen.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_example.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_jiripetru_elves.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_kafine_animals.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_magnut_next_underground.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_nwkohaku_animals.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_nwkohaku_birds.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_nwkohaku_bugs.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_animals.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_dwarves.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_goblins.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_humanoids.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_humans.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_phoebus_procedural.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_sphr_kobolds.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/graphics/graphics_sphr_monsters.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_disturbance.txt"
18:53:32 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_region.txt"
18:53:32 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_secret.txt"
18:53:32 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_underground_special.txt"
18:53:32 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_vampire.txt"
18:53:32 | Git | sparkleshare.git | Conflict type: M  "region3/raw/interaction examples/interaction_werebeast.txt"
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/b_detail_plan_default.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/body_default.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/body_rcp.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/building_custom.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/c_variation_default.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_amphibians.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_annelids.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_birds.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_birds_new.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_bug_slug_new.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_desert_new.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_domestic.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_equipment.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_fanciful.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_insects.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_mountain.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_ocean.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_riverlake.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_temperate.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_tropical.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_large_tundra.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_mountain_new.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_next_underground.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_ocean_new.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_other.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_reptiles.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_riverlakepool_new.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_savage_tropical.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_mammal_new.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_mammals.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_ocean.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_small_riverlake.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_standard.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_subterranean.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_temperate_new.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_tropical_new.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/creature_tundra_taiga_new.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_color_standard.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_pattern_iris_eye.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_pattern_pupil_eye.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_pattern_special.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/descriptor_shape_standard.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/entity_default.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_metal.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_other.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_gem.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_layer.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_mineral.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/inorganic_stone_soil.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/interaction_standard.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_ammo.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_armor.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_food.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_gloves.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_helm.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_instrument.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_pants.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_shield.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_shoes.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_siegeammo.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_tool.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_toy.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_trapcomp.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/item_weapon.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_DWARF.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_ELF.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_GOBLIN.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_HUMAN.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_SYM.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/language_words.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/material_template_default.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/plant_grasses.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/plant_standard.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/reaction_other.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/reaction_smelter.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/text/book_art.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/text/book_instruction.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/text/secret_death.txt
18:53:32 | Git | sparkleshare.git | Conflict type: M  region3/raw/objects/tissue_template_default.txt
18:53:32 | Cmd | sparkleshare.git | git add --all
18:53:32 | Git | sparkleshare.git | Changes staged
18:53:32 | Cmd | sparkleshare.git | git rebase --skip
18:53:33 | Cmd | sparkleshare.git | git status --porcelain
18:53:34 | Cmd | sparkleshare.git | git status --porcelain