Changes
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/components/yunohost/admin/changes/?format=api&page=772
https://translate.yunohost.org/api/components/yunohost/admin/changes/?format=api&page=773", "previous": "https://translate.yunohost.org/api/components/yunohost/admin/changes/?format=api&page=771", "results": [ { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-06T12:05:26.549820Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19503, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19503/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-05T20:11:15.036850Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19501, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19501/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-05T01:11:39.500140Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19497, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19497/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-04T19:40:15.404099Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19494, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19494/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:34:11.842189Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19468, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19468/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:33:32.293334Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19465, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19465/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:28:18.471514Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19463, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19463/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:27:16.979480Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19461, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19461/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:26:26.301888Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19460, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19460/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:21:48.986933Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19457, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19457/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:21:27.242828Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19456, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19456/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:19:46.985555Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19453, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19453/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:19:38.182513Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19452, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19452/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:18:55.404391Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19450, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19450/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:17:33.819852Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19447, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19447/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:17:17.734719Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19446, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19446/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:16:26.093919Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19443, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19443/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:14:44.956382Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19441, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19441/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:11:42.383988Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19439, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19439/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:10:11.250075Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19437, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19437/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:10:00.378695Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19435, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19435/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:09:43.386529Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19433, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19433/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:09:39.243015Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19431, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19431/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:09:25.016575Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19429, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19429/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:08:46.219159Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19427, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19427/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:08:41.809641Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19425, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19425/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:08:31.215505Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19423, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19423/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:04:14.278538Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19420, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19420/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:04:10.979270Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19418, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19418/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:04:04.928005Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19417, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19417/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:03:53.686769Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19414, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19414/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:03:44.687138Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19413, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19413/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:03:26.737569Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19411, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19411/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:03:23.115951Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19408, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19408/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:02:41.147704Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19406, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19406/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:01:38.132526Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19405, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19405/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:00:59.697274Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19402, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19402/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:00:39.110412Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19400, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19400/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:00:32.381959Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19398, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19398/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T17:59:53.473528Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19395, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19395/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T17:59:21.308403Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19394, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19394/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T17:59:17.447045Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19392, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19392/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T17:58:44.190785Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19390, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19390/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T17:58:23.013686Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19387, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19387/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T17:56:37.651913Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19385, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19385/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T17:56:15.187542Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19384, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19384/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T17:55:53.345060Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19381, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19381/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T17:54:48.318163Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19380, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19380/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T17:54:30.590439Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19377, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19377/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T17:54:24.577399Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19376, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19376/?format=api" } ] }{ "count": 41081, "next": "