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/polyglot/main/?format=api",
    "translation": null,
    "user": "https://weblate.foundryvtt-hub.com/api/users/mclemente/?format=api",
    "author": null,
    "timestamp": "2022-09-05T18:49:58.950592Z",
    "action": 22,
    "target": "Auto-merging lang/pt-BR.json\nCONFLICT (content): Merge conflict in lang/pt-BR.json\nAuto-merging lang/ko.json\nCONFLICT (content): Merge conflict in lang/ko.json\nAuto-merging lang/es.json\nCONFLICT (content): Merge conflict in lang/es.json\nAuto-merging lang/en.json\nCONFLICT (content): Merge conflict in lang/en.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)",
    "old": "",
    "details": {
        "error": "Auto-merging lang/pt-BR.json\nCONFLICT (content): Merge conflict in lang/pt-BR.json\nAuto-merging lang/ko.json\nCONFLICT (content): Merge conflict in lang/ko.json\nAuto-merging lang/es.json\nCONFLICT (content): Merge conflict in lang/es.json\nAuto-merging lang/en.json\nCONFLICT (content): Merge conflict in lang/en.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 22 and 1 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\nUnmerged paths:\n  (use \"git add <file>...\" to mark resolution)\n\tboth modified:   lang/en.json\n\tboth modified:   lang/es.json\n\tboth modified:   lang/ko.json\n\tboth modified:   lang/pt-BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
    },
    "id": 26747,
    "action_name": "Repository merge failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/26747/?format=api"
}