Changes
Translation projects API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/projects/encounter-stats/changes/?format=api&page=4
{ "count": 1988, "next": "https://weblate.foundryvtt-hub.com/api/projects/encounter-stats/changes/?format=api&page=5", "previous": "https://weblate.foundryvtt-hub.com/api/projects/encounter-stats/changes/?format=api&page=3", "results": [ { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-11-20T02:08:51.327583Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto d94e05d\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'd94e05d'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 402780, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/402780/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-11-20T02:08:50.230363Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 402779, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/402779/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-11-13T02:18:22.733674Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 04d45d1\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '04d45d1'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 399410, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/399410/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-11-13T02:18:20.380926Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 399409, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/399409/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-11-06T00:11:39.543889Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto ed2c030\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'ed2c030'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 397732, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/397732/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-11-06T00:11:37.643907Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 397731, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/397731/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-11-03T07:32:31.267908Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 5aa55a4\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '5aa55a4'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 396520, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/396520/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-11-03T07:32:30.289352Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 396519, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/396519/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-11-03T07:30:08.024786Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 43f1bc3\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '43f1bc3'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 396518, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/396518/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-11-03T07:30:06.697289Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 396517, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/396517/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-30T01:27:02.967984Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto a710da2\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'a710da2'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 395761, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/395761/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-30T01:27:02.014294Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 395760, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/395760/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-23T00:35:18.031480Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto f188d13\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'f188d13'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 392066, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/392066/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-23T00:35:16.924528Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 392065, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/392065/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-21T10:53:17.879841Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 43f0622\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '43f0622'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 391572, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/391572/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-21T10:53:17.067825Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 391571, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/391571/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-21T10:44:15.464505Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto e4fc1e1\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'e4fc1e1'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 391568, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/391568/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-21T10:44:14.423791Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 391567, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/391567/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-21T10:25:51.244786Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 1411291\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '1411291'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 391559, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/391559/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-21T10:21:07.851932Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 391557, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/391557/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-21T07:39:54.370605Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 6f5919e\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '6f5919e'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 391552, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/391552/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-21T07:39:53.480855Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 391551, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/391551/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-21T01:51:22.554396Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 6c23fe4\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '6c23fe4'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 391534, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/391534/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-21T01:51:20.880827Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 391533, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/391533/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-16T01:03:29.208685Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 369ebb2\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '369ebb2'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 388861, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/388861/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-16T01:03:27.511900Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 388860, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/388860/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-15T23:01:52.808579Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 110aa4c\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '110aa4c'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 388859, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/388859/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-15T23:01:51.849243Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 388858, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/388858/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-15T04:53:50.488131Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto ff81122\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'ff81122'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 388292, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/388292/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-15T04:53:49.386524Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 388291, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/388291/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-14T21:56:56.956065Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 7f6bc75\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '7f6bc75'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 388243, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/388243/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-14T21:56:55.858850Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 388242, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/388242/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-14T05:03:02.712895Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 92ff0c9\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '92ff0c9'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 387620, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/387620/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-14T05:03:01.720987Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 387619, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/387619/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-14T00:09:58.121089Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto d678f3c\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'd678f3c'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 387610, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/387610/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-14T00:09:56.769572Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 387609, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/387609/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-07T01:34:36.896086Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto b7ac98f\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'b7ac98f'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 386503, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/386503/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-07T01:34:35.500062Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 386502, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/386502/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-02T14:00:36.954547Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 0219bfd\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '0219bfd'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 384832, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/384832/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-02T14:00:36.052951Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 384831, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/384831/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-02T13:58:21.624755Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 4374d0d\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '4374d0d'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 384830, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/384830/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-02T13:58:20.377959Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 384829, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/384829/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-02T06:25:04.702392Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto a23ba4f\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'a23ba4f'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 384731, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/384731/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-02T06:25:01.986580Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 384730, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/384730/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-01T14:13:46.395016Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 26e002c\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '26e002c'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 384643, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/384643/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-10-01T14:13:45.111392Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 384642, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/384642/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-30T00:06:57.539873Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 92a1bfa\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '92a1bfa'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 384383, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/384383/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-30T00:06:55.943412Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 384382, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/384382/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-25T00:24:56.671584Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto f23ed57\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'f23ed57'.\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: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 382366, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/382366/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-25T00:24:54.146824Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 382365, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/382365/?format=api" } ] }