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/the-forge/common/?format=api",
    "translation": null,
    "user": "https://weblate.foundryvtt-hub.com/api/users/Eranziel/?format=api",
    "author": null,
    "timestamp": "2025-07-23T14:11:45.858074Z",
    "action": 22,
    "target": "Auto-merging locales/es/client.json\nAuto-merging locales/es/server.json\nAuto-merging locales/fr/common.json\nCONFLICT (content): Merge conflict in locales/fr/common.json\nAuto-merging locales/pt-BR/common.json\nCONFLICT (content): Merge conflict in locales/pt-BR/common.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)",
    "old": "",
    "details": {
        "error": "Auto-merging locales/es/client.json\nAuto-merging locales/es/server.json\nAuto-merging locales/fr/common.json\nCONFLICT (content): Merge conflict in locales/fr/common.json\nAuto-merging locales/pt-BR/common.json\nCONFLICT (content): Merge conflict in locales/pt-BR/common.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)",
        "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 4 and 15 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:   locales/de/client.json\n\tmodified:   locales/de/common.json\n\tmodified:   locales/de/server.json\n\tmodified:   locales/en/client.json\n\tmodified:   locales/en/common.json\n\tmodified:   locales/en/server.json\n\tmodified:   locales/es/client.json\n\tmodified:   locales/es/common.json\n\tmodified:   locales/es/server.json\n\tmodified:   locales/fr/client.json\n\tmodified:   locales/fr/server.json\n\tmodified:   locales/ja/client.json\n\tmodified:   locales/ja/common.json\n\tmodified:   locales/ja/server.json\n\tmodified:   locales/pt-BR/client.json\n\tmodified:   locales/pt-BR/server.json\n\nUnmerged paths:\n  (use \"git add <file>...\" to mark resolution)\n\tboth modified:   locales/fr/common.json\n\tboth modified:   locales/pt-BR/common.json\n\n"
    },
    "id": 507094,
    "action_name": "Repository merge failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/507094/?format=api"
}