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/stairways/main/?format=api",
    "translation": null,
    "user": "https://weblate.foundryvtt-hub.com/api/users/SWW13/?format=api",
    "author": null,
    "timestamp": "2022-10-31T17:41:24.353264Z",
    "action": 22,
    "target": "Removing src/StairwayData.js\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nCONFLICT (add/add): Merge conflict in lang/fr.json\nAuto-merging lang/fr.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)",
    "old": "",
    "details": {
        "error": "Removing src/StairwayData.js\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nCONFLICT (add/add): Merge conflict in lang/fr.json\nAuto-merging lang/fr.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 28 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:   .editorconfig\n\tmodified:   .gitlab-ci.yml\n\tmodified:   .husky/pre-commit\n\tmodified:   CHANGELOG.md\n\tmodified:   README.md\n\tmodified:   lang/en.json\n\tmodified:   lang/es.json\n\tmodified:   package.json\n\tmodified:   src/BaseStairway.js\n\tmodified:   src/Stairway.js\n\tmodified:   src/StairwayConfig.js\n\tmodified:   src/StairwayControl.js\n\tdeleted:    src/StairwayData.js\n\tmodified:   src/StairwayLayer.js\n\tmodified:   src/dataQuirks.js\n\tmodified:   src/injection.js\n\tmodified:   src/main.js\n\tmodified:   src/migration.js\n\tmodified:   src/teleport.js\n\tmodified:   templates/module-management-tags.hbs\n\tmodified:   templates/stairway-config.hbs\n\tmodified:   yarn.lock\n\nUnmerged paths:\n  (use \"git add <file>...\" to mark resolution)\n\tboth added:      lang/fr.json\n\tboth modified:   module.json\n\n"
    },
    "id": 115908,
    "action_name": "Repository merge failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/115908/?format=api"
}