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-10-11T22:36:45.152792Z",
    "action": 22,
    "target": "Auto-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/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 9 and 3 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/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/sheets/SwadeItemSheetV2.ts\n\nUnmerged paths:\n  (use \"git add <file>...\" to mark resolution)\n\tboth modified:   src/lang/pl.yml\n\n"
    },
    "id": 487724,
    "action_name": "Repository merge failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/487724/?format=api"
}