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/automated-evocations-variant-fork/main/?format=api",
    "translation": null,
    "user": "https://weblate.foundryvtt-hub.com/api/users/JDW/?format=api",
    "author": null,
    "timestamp": "2023-02-18T17:14:23.958882Z",
    "action": 22,
    "target": "CONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)",
    "old": "",
    "details": {
        "error": "CONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\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 11 and 5 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 added:      changelog.md\n\tboth added:      package.json\n\tboth added:      src/module.json\n\tboth added:      src/scripts/api.js\n\tboth added:      src/scripts/companionmanager.js\n\tboth added:      src/scripts/custombindings.js\n\tboth added:      src/scripts/lib/lib.js\n\tboth added:      src/scripts/main.js\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
    },
    "id": 245712,
    "action_name": "Repository merge failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/245712/?format=api"
}