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": "https://weblate.foundryvtt-hub.com/api/users/FloRad/?format=api",
    "author": null,
    "timestamp": "2024-11-04T22:19:20.030542Z",
    "action": 22,
    "target": "Auto-merging src/lang/de.yml\nAuto-merging src/lang/fr.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/de.yml\nAuto-merging src/lang/fr.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 10 and 21 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:   CHANGELOG.md\n\tmodified:   src/globals.d.ts\n\tmodified:   src/lang/ca.yml\n\tmodified:   src/lang/de.yml\n\tmodified:   src/lang/en.yml\n\tmodified:   src/lang/es.yml\n\tmodified:   src/lang/fr.yml\n\tmodified:   src/lang/gl.yml\n\tmodified:   src/lang/pt_BR.yml\n\tmodified:   src/lang/zh_Hans.yml\n\tmodified:   src/module/ItemChatCardHelper.ts\n\tmodified:   src/module/apps/ActiveEffectWizard.ts\n\tmodified:   src/module/apps/SwadeDocumentTweaks.ts\n\tmodified:   src/module/canvas/SwadeToken.ts\n\tmodified:   src/module/chaseUtils.ts\n\tmodified:   src/module/constants.ts\n\tmodified:   src/module/data/actor/base/base.ts\n\tmodified:   src/module/data/actor/base/creature.ts\n\tnew file:   src/module/data/fields/FormulaField.ts\n\tmodified:   src/module/data/item/action.ts\n\tmodified:   src/module/data/item/armor.ts\n\tmodified:   src/module/data/item/base/base.ts\n\tmodified:   src/module/data/item/common.ts\n\tmodified:   src/module/data/item/consumable.ts\n\tmodified:   src/module/data/item/gear.ts\n\tmodified:   src/module/data/item/item-common.interface.ts\n\tmodified:   src/module/data/item/power.ts\n\tmodified:   src/module/data/item/shield.ts\n\tmodified:   src/module/data/item/weapon.ts\n\tmodified:   src/module/dice/SwadeRoll.ts\n\tmodified:   src/module/dice/TraitRoll.ts\n\tmodified:   src/module/documents/active-effect/SwadeActiveEffect.ts\n\tmodified:   src/module/documents/actor/SwadeActor.ts\n\tmodified:   src/module/documents/combat/SwadeCombat.ts\n\tmodified:   src/module/documents/item/SwadeItem.ts\n\tmodified:   src/module/hooks/SwadeCoreHooks.ts\n\tmodified:   src/module/preloadTemplates.ts\n\tmodified:   src/module/settings.ts\n\tmodified:   src/module/sheets/CharacterSheet.ts\n\tmodified:   src/module/sheets/SwadeBaseActorSheet.ts\n\tmodified:   src/module/sheets/SwadeItemSheetV2.ts\n\tmodified:   src/module/sheets/SwadeVehicleSheet.ts\n\tmodified:   src/module/util.ts\n\tmodified:   src/scss/_chat.scss\n\tmodified:   src/scss/apps/_tweaks.scss\n\tmodified:   src/scss/chat/_rolls.scss\n\tmodified:   src/swade.ts\n\tmodified:   src/templates/actors/apps/tweaks-dialog.hbs\n\tmodified:   src/templates/actors/character/partials/item-card.hbs\n\tmodified:   src/templates/actors/character/sheet.hbs\n\tmodified:   src/templates/actors/character/tabs/actions.hbs\n\tmodified:   src/templates/actors/character/tabs/powers.hbs\n\tmodified:   src/templates/actors/character/tabs/summary.hbs\n\tmodified:   src/templates/actors/npc-sheet.hbs\n\tmodified:   src/templates/actors/partials/npc-summary-tab.hbs\n\tmodified:   src/templates/actors/vehicle-partials/summary-tab.hbs\n\tmodified:   src/templates/actors/vehicle-sheet.hbs\n\tmodified:   src/templates/chat/dice/roll-message.hbs\n\tmodified:   src/templates/chat/item-card.hbs\n\tmodified:   src/templates/item/ability.hbs\n\tmodified:   src/templates/item/action.hbs\n\tmodified:   src/templates/item/ancestry.hbs\n\tmodified:   src/templates/item/armor.hbs\n\tmodified:   src/templates/item/consumable.hbs\n\tmodified:   src/templates/item/edge.hbs\n\tmodified:   src/templates/item/gear.hbs\n\tmodified:   src/templates/item/hindrance.hbs\n\tmodified:   src/templates/item/partials/tabs/actions.hbs\n\tmodified:   src/templates/item/power.hbs\n\tmodified:   src/templates/item/shield.hbs\n\tmodified:   src/templates/item/skill.hbs\n\tmodified:   src/templates/item/weapon.hbs\n\tmodified:   src/templates/sidebar/combat-tracker.hbs\n\tnew file:   src/types/CCM.d.ts\n\nUnmerged paths:\n  (use \"git add <file>...\" to mark resolution)\n\tboth modified:   src/lang/pl.yml\n\n"
    },
    "id": 489855,
    "action_name": "Repository merge failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/489855/?format=api"
}