Change Instance

HTTP 200 OK
Allow: GET, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "unit": null,
    "component": "https://weblate.foundryvtt-hub.com/api/components/swade/main/?format=api",
    "translation": null,
    "user": null,
    "author": null,
    "timestamp": "2024-08-19T13:01:23.145895Z",
    "action": 22,
    "target": "Auto-merging src/lang/pt_BR.yml\nCONFLICT (content): Merge conflict in src/lang/pt_BR.yml\nAuto-merging src/lang/pl.yml\nCONFLICT (content): Merge conflict in src/lang/pl.yml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)",
    "old": "",
    "details": {
        "error": "Auto-merging src/lang/pt_BR.yml\nCONFLICT (content): Merge conflict in src/lang/pt_BR.yml\nAuto-merging src/lang/pl.yml\nCONFLICT (content): Merge conflict in src/lang/pl.yml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)",
        "status": "On branch develop\nYour branch and 'origin/develop' have diverged,\nand have 5 and 6 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n  (fix conflicts and run \"git commit\")\n  (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified:   src/lang/en.yml\n\tmodified:   src/module/canvas/SwadeMeasuredTemplate.ts\n\tmodified:   src/module/data/actor/character.ts\n\tmodified:   src/module/data/actor/npc.ts\n\tmodified:   src/module/data/actor/vehicle.ts\n\tmodified:   src/module/data/item/ability.ts\n\tmodified:   src/module/data/item/action.ts\n\tmodified:   src/module/data/item/ancestry.ts\n\tmodified:   src/module/data/item/armor.ts\n\tmodified:   src/module/data/item/consumable.ts\n\tmodified:   src/module/data/item/edge.ts\n\tmodified:   src/module/data/item/gear.ts\n\tmodified:   src/module/data/item/hindrance.ts\n\tmodified:   src/module/data/item/power.ts\n\tmodified:   src/module/data/item/shield.ts\n\tmodified:   src/module/data/item/skill.ts\n\tmodified:   src/module/data/item/weapon.ts\n\tmodified:   src/module/handlebarsHelpers.ts\n\tmodified:   src/module/util.ts\n\tnew file:   src/scss/_actor-embeds.scss\n\tnew file:   src/scss/_item-embeds.scss\n\tmodified:   src/swade.scss\n\tnew file:   src/templates/embeds/ability-embeds.hbs\n\tnew file:   src/templates/embeds/action-embeds.hbs\n\tnew file:   src/templates/embeds/actor-embeds.hbs\n\tnew file:   src/templates/embeds/ancestry-embeds.hbs\n\tnew file:   src/templates/embeds/armor-embeds.hbs\n\tnew file:   src/templates/embeds/consumable-embeds.hbs\n\tnew file:   src/templates/embeds/edge-embeds.hbs\n\tnew file:   src/templates/embeds/gear-embeds.hbs\n\tnew file:   src/templates/embeds/hindrance-embeds.hbs\n\tnew file:   src/templates/embeds/power-embeds.hbs\n\tnew file:   src/templates/embeds/shield-embeds.hbs\n\tnew file:   src/templates/embeds/skill-embeds.hbs\n\tnew file:   src/templates/embeds/vehicle-embeds.hbs\n\tnew file:   src/templates/embeds/weapon-embeds.hbs\n\nUnmerged paths:\n  (use \"git add <file>...\" to mark resolution)\n\tboth modified:   src/lang/pl.yml\n\tboth modified:   src/lang/pt_BR.yml\n\n"
    },
    "id": 479067,
    "action_name": "Repository merge failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/479067/?format=api"
}