Changes
Translation projects API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/projects/yunohost/changes/?format=api&page=2491
{ "count": 138740, "next": "https://translate.yunohost.org/api/projects/yunohost/changes/?format=api&page=2492", "previous": "https://translate.yunohost.org/api/projects/yunohost/changes/?format=api&page=2490", "results": [ { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-25T20:17:00.981237Z", "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": 20298, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20298/?format=api" }, { "unit": "https://translate.yunohost.org/api/units/33740/?format=api", "component": "https://translate.yunohost.org/api/components/yunohost/core/?format=api", "translation": "https://translate.yunohost.org/api/translations/yunohost/core/de/?format=api", "user": "https://translate.yunohost.org/api/users/chwonl/?format=api", "author": "https://translate.yunohost.org/api/users/chwonl/?format=api", "timestamp": "2020-12-21T15:49:52.023030Z", "action": 2, "target": "Das System hat einige Prozesse beendet, weil ihm der Arbeitsspeicher ausgegangen ist. Das passiert normalerweise, wenn das System ingesamt nicht genügend Arbeitsspeicher zur Verfügung hat oder wenn ein einzelner Prozess zu viel Speicher verbraucht. Zusammenfassung der beendeten Prozesse: \n{kills_summary}", "id": 20297, "action_name": "Translation changed", "url": "https://translate.yunohost.org/api/changes/20297/?format=api" }, { "unit": "https://translate.yunohost.org/api/units/33740/?format=api", "component": "https://translate.yunohost.org/api/components/yunohost/core/?format=api", "translation": "https://translate.yunohost.org/api/translations/yunohost/core/de/?format=api", "user": "https://translate.yunohost.org/api/users/chwonl/?format=api", "author": "https://translate.yunohost.org/api/users/chwonl/?format=api", "timestamp": "2020-12-21T15:44:37.284070Z", "action": 2, "target": "Das System hat einige Prozesse beendet, weil ihm der Arbeitsspeicher ausgegangen ist. Das passiert normalerweise, wenn das System ingesamt nicht genügend Arbeitsspeicher zur Verfügung hat oder wenn ein einzelner Prozess zu viel Speicher verbraucht. Zusammenfassung der beendeten Prozesse: {kills_summary}", "id": 20296, "action_name": "Translation changed", "url": "https://translate.yunohost.org/api/changes/20296/?format=api" }, { "unit": "https://translate.yunohost.org/api/units/33740/?format=api", "component": "https://translate.yunohost.org/api/components/yunohost/core/?format=api", "translation": "https://translate.yunohost.org/api/translations/yunohost/core/de/?format=api", "user": "https://translate.yunohost.org/api/users/chwonl/?format=api", "author": "https://translate.yunohost.org/api/users/chwonl/?format=api", "timestamp": "2020-12-21T15:43:26.688323Z", "action": 2, "target": "Das System hat einige Prozesse beendet, weil nicht genügend Arbeitsspeicher vorhanden ist. Das passiert normalerweise, wenn das System ingesamt nicht genügend Arbeitsspeicher zur Verfügung hat oder wenn ein einzelner Prozess zu viel Speicher verbraucht. Zusammenfassung der beendeten Prozesse: {kills_summary}", "id": 20295, "action_name": "Translation changed", "url": "https://translate.yunohost.org/api/changes/20295/?format=api" }, { "unit": "https://translate.yunohost.org/api/units/30879/?format=api", "component": "https://translate.yunohost.org/api/components/yunohost/core/?format=api", "translation": "https://translate.yunohost.org/api/translations/yunohost/core/de/?format=api", "user": "https://translate.yunohost.org/api/users/chwonl/?format=api", "author": "https://translate.yunohost.org/api/users/chwonl/?format=api", "timestamp": "2020-12-21T15:42:09.435440Z", "action": 5, "target": "Sie haben kürzlich einen neuen Yunohost-Server installiert aber es gibt davon noch keinen Diagnosereport. Sie sollten eine Diagnose anstossen. Sie können das entweder vom Webadmin aus oder in der Kommandozeile machen. In der Kommandozeile verwenden Sie dafür den Befehl 'yunohost diagnosis run'.", "id": 20294, "action_name": "Translation added", "url": "https://translate.yunohost.org/api/changes/20294/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:12:36.736454Z", "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": 20293, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20293/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:12:36.686570Z", "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": 20292, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20292/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:12:11.837112Z", "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": 20291, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20291/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:12:11.787675Z", "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": 20290, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20290/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:12:06.071109Z", "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": 20289, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20289/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:12:05.967228Z", "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": 20288, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20288/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:07:20.632898Z", "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": 20287, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20287/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:07:20.536453Z", "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": 20286, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20286/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:07:12.353178Z", "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": 20285, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20285/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:07:12.350245Z", "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": 20284, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20284/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:07:06.557844Z", "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": 20283, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20283/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:07:06.374631Z", "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": 20282, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20282/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:07:00.618400Z", "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": 20281, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20281/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:07:00.614811Z", "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": 20280, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20280/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:54.784229Z", "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": 20279, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20279/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:54.724091Z", "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": 20278, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20278/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:48.976407Z", "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": 20277, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20277/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:48.967178Z", "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": 20276, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20276/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:43.215353Z", "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": 20275, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20275/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:43.191105Z", "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": 20274, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20274/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:37.363581Z", "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": 20273, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20273/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:37.315000Z", "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": 20272, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20272/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:31.623286Z", "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": 20271, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20271/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:31.566555Z", "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": 20270, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20270/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:25.840132Z", "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": 20269, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20269/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:25.828683Z", "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": 20268, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20268/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:20.127094Z", "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": 20267, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20267/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:20.102028Z", "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": 20266, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20266/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:14.188531Z", "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": 20265, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20265/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:14.162168Z", "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": 20264, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20264/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:08.371572Z", "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": 20263, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20263/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:08.341827Z", "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": 20262, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20262/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:03.225938Z", "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": 20261, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20261/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:02.157019Z", "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": 20260, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20260/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:56.178000Z", "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": 20259, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20259/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:56.130465Z", "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": 20258, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20258/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:49.994584Z", "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": 20257, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20257/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:49.939609Z", "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": 20256, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20256/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:43.493426Z", "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": 20255, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20255/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:43.487067Z", "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": 20254, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20254/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:37.145397Z", "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": 20253, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20253/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:37.134964Z", "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": 20252, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20252/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/moulinette/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:30.825662Z", "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": 20251, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20251/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:30.802919Z", "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": 20250, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20250/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:25.068944Z", "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": 20249, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20249/?format=api" } ] }