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/pf1/main/?format=api",
    "translation": null,
    "user": "https://weblate.foundryvtt-hub.com/api/users/Ethaks/?format=api",
    "author": null,
    "timestamp": "2024-06-08T20:39:31.004405Z",
    "action": 22,
    "target": "Auto-merging lang/de.json\nCONFLICT (content): Merge conflict in lang/de.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)",
    "old": "",
    "details": {
        "error": "Auto-merging lang/de.json\nCONFLICT (content): Merge conflict in lang/de.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)",
        "status": "On branch master\nYour branch and 'origin/master' have diverged,\nand have 4 and 8 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\tnew file:   changelogs/unreleased/Add-roll-tables-for-technology-gear-and-numerian-fluid_1.json\n\tmodified:   less/sheets/actors/parts/currency.less\n\tmodified:   less/sheets/actors/vehicle.less\n\tmodified:   module/applications/actor/actor-sheet.mjs\n\tmodified:   module/applications/actor/vehicle-sheet.mjs\n\tmodified:   module/documents/actor/actor-vehicle.mjs\n\tmodified:   module/utils/_module.mjs\n\tmodified:   module/utils/lib.mjs\n\tnew file:   packs/roll-tables/armor-glitches.qFPRaauE9waEbdPl.yaml\n\tnew file:   packs/roll-tables/general-glitches.pZK4JYYWmQrNC6QU.yaml\n\tnew file:   packs/roll-tables/numerian-fluids-exceptional-side-effect.x1eyeyxhEqbmdI8K.yaml\n\tnew file:   packs/roll-tables/numerian-fluids-side-effects.q3oZUdxEKh6ELIGb.yaml\n\tnew file:   packs/roll-tables/pharmaceutical-glitches.mr1QW7D5gBjkI4ky.yaml\n\tnew file:   packs/roll-tables/technology.sAUz05nQd6u3BJBM.yaml\n\tnew file:   packs/roll-tables/timeworn-glitches.yMDuGGkh79OKWpbA.yaml\n\tnew file:   packs/roll-tables/weapon-glitches.UcG5gIkruPj58z7d.yaml\n\tmodified:   public/templates/actors/npc-sheet-loot.hbs\n\tmodified:   public/templates/actors/parts/actor-inventory.hbs\n\tmodified:   public/templates/actors/vehicle-sheet.hbs\n\tmodified:   public/templates/items/attack.hbs\n\tmodified:   public/templates/items/weapon.hbs\n\nUnmerged paths:\n  (use \"git add <file>...\" to mark resolution)\n\tboth modified:   lang/de.json\n\n"
    },
    "id": 463005,
    "action_name": "Repository merge failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/463005/?format=api"
}