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/hey-wait/main/?format=api",
    "translation": null,
    "user": null,
    "author": null,
    "timestamp": "2023-03-16T16:18:54.684144Z",
    "action": 23,
    "target": "Rebasing (1/4)\ndropping 51f8541af90d16fb181dbf570326288d12d279dc 0.7.3 -- patch contents already upstream\nRebasing (2/4)\ndropping ef1b4a119348c64af777903ddec8717f89d735a6 Translated using Weblate (Japanese) -- patch contents already upstream\nRebasing (3/4)\nerror: could not apply 8c3bc50... Added translation using Weblate (French)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 8c3bc50... Added translation using Weblate (French)\nCONFLICT (add/add): Merge conflict in src/lang/fr.json\nAuto-merging src/lang/fr.json\n (1)",
    "old": "",
    "details": {
        "error": "Rebasing (1/4)\ndropping 51f8541af90d16fb181dbf570326288d12d279dc 0.7.3 -- patch contents already upstream\nRebasing (2/4)\ndropping ef1b4a119348c64af777903ddec8717f89d735a6 Translated using Weblate (Japanese) -- patch contents already upstream\nRebasing (3/4)\nerror: could not apply 8c3bc50... Added translation using Weblate (French)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 8c3bc50... Added translation using Weblate (French)\nCONFLICT (add/add): Merge conflict in src/lang/fr.json\nAuto-merging src/lang/fr.json\n (1)",
        "status": "interactive rebase in progress; onto 249a80e\nLast commands done (3 commands done):\n   pick ef1b4a1 Translated using Weblate (Japanese)\n   pick 8c3bc50 Added translation using Weblate (French)\n  (see more in file .git/rebase-merge/done)\nNext command to do (1 remaining command):\n   pick 2abacff Translated using Weblate (French)\n  (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'V10-Support' on '249a80e'.\n  (fix conflicts and then run \"git rebase --continue\")\n  (use \"git rebase --skip\" to skip this patch)\n  (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n  (use \"git restore --staged <file>...\" to unstage)\n  (use \"git add <file>...\" to mark resolution)\n\tboth added:      src/lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
    },
    "id": 281433,
    "action_name": "Repository rebase failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/281433/?format=api"
}