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/visual-active-effects/main/?format=api",
    "translation": null,
    "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api",
    "author": null,
    "timestamp": "2023-07-08T06:49:47.070727Z",
    "action": 22,
    "target": "Auto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)",
    "old": "",
    "details": {
        "error": "Auto-merging module.json\nCONFLICT (content): Merge conflict in module.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 2 and 26 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:   README.md\n\tmodified:   lang/cs.json\n\tmodified:   lang/de.json\n\tmodified:   lang/en.json\n\tnew file:   lang/pl.json\n\tmodified:   lang/pt_BR.json\n\tmodified:   scripts/helpers.mjs\n\tmodified:   scripts/textEditor.mjs\n\tmodified:   scripts/visual-active-effects.mjs\n\tmodified:   setup.mjs\n\tmodified:   styles/visual-active-effects.css\n\tnew file:   templates/effect.hbs\n\tmodified:   templates/vae-editor.hbs\n\tmodified:   templates/visual-active-effects.hbs\n\nUnmerged paths:\n  (use \"git add <file>...\" to mark resolution)\n\tboth modified:   module.json\n\n"
    },
    "id": 359938,
    "action_name": "Repository merge failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/359938/?format=api"
}