Changes
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/components/wallabag/ios-app-setting/changes/?format=api&page=3
https://hosted.weblate.org/api/components/wallabag/ios-app-setting/changes/?format=api&page=4", "previous": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/changes/?format=api&page=2", "results": [ { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-07-16T23:27:14.169843+02:00", "action": 53, "target": "", "id": 29624199, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/29624199/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-06-29T12:57:02.577561+02:00", "action": 23, "target": "Rebasing (1/213)\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKitError.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKitError.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCOerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nNFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 28350556, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/28350556/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-06-29T12:56:58.369557+02:00", "action": 53, "target": "", "id": 28350552, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/28350552/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-06-28T23:58:35.160143+02:00", "action": 23, "target": "Rebasing (1/213)\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKitError.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKitError.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCOerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nNFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 28295799, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/28295799/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-06-28T23:58:30.828159+02:00", "action": 53, "target": "", "id": 28295797, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/28295797/?format=api" }, { "unit": "https://hosted.weblate.org/api/units/17660338/?format=api", "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": "https://hosted.weblate.org/api/translations/wallabag/ios-app-setting/pt/?format=api", "user": null, "author": "https://hosted.weblate.org/api/users/anonymous/?format=api", "timestamp": "2022-06-19T08:31:34.428925+02:00", "action": 4, "target": "Grupo", "id": 27637174, "action_name": "Suggestion added", "url": "https://hosted.weblate.org/api/changes/27637174/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": "https://hosted.weblate.org/api/users/j0k3r/?format=api", "author": null, "timestamp": "2022-06-15T10:00:12.025426+02:00", "action": 23, "target": "Rebasing (1/213)\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKitError.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKitError.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCOerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nNFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 27372285, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/27372285/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-06-14T13:05:35.298123+02:00", "action": 23, "target": "Rebasing (1/213)\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKitError.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKitError.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCOerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nNFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 27314108, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/27314108/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-06-14T13:05:32.056236+02:00", "action": 53, "target": "", "id": 27314106, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/27314106/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-06-14T12:59:05.098241+02:00", "action": 23, "target": "Rebasing (1/213)\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKitError.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKitError.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCOerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nNFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 27314077, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/27314077/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-06-14T12:59:01.146972+02:00", "action": 53, "target": "", "id": 27314075, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/27314075/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-06-08T22:41:31.183189+02:00", "action": 23, "target": "Rebasing (1/213)\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKitError.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKitError.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCOerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nNFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 27090148, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/27090148/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-06-08T22:41:26.855801+02:00", "action": 53, "target": "", "id": 27090146, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/27090146/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-05-29T23:54:25.128220+02:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 25885179, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/25885179/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-05-29T23:54:21.050876+02:00", "action": 53, "target": "", "id": 25885178, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/25885178/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-05-26T07:53:42.327690+02:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 25634340, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/25634340/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-05-26T07:53:39.221431+02:00", "action": 53, "target": "", "id": 25634338, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/25634338/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-05-26T07:52:23.143707+02:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 25634336, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/25634336/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-05-26T07:52:19.068482+02:00", "action": 53, "target": "", "id": 25634334, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/25634334/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-05-25T14:15:51.142559+02:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 25617578, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/25617578/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-05-23T13:03:51.167259+02:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 25310698, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/25310698/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-05-23T13:03:46.861099+02:00", "action": 53, "target": "", "id": 25310696, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/25310696/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-05-11T13:04:55.470748+02:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 24755634, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/24755634/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-05-11T13:04:51.217655+02:00", "action": 53, "target": "", "id": 24755632, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/24755632/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-05-10T23:12:18.450553+02:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 24743960, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/24743960/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-05-10T23:12:14.421473+02:00", "action": 53, "target": "", "id": 24743959, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/24743959/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-05-04T18:58:44.219730+02:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 24490817, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/24490817/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-05-04T18:58:40.541026+02:00", "action": 53, "target": "", "id": 24490814, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/24490814/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-04-29T21:40:22.019785+02:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 24241520, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/24241520/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-30T07:04:51.051592+02:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 22552073, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/22552073/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-28T21:32:20.704815+02:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 22454222, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/22454222/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-04T16:21:11.677523+01:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 18548494, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/18548494/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-04T16:21:08.518029+01:00", "action": 53, "target": "", "id": 18548491, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/18548491/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-04T16:19:48.833733+01:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 18548470, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/18548470/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-04T16:19:45.183244+01:00", "action": 53, "target": "", "id": 18548467, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/18548467/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-04T11:51:43.734646+01:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 18535420, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/18535420/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-04T11:51:39.840256+01:00", "action": 53, "target": "", "id": 18535418, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/18535418/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-01T00:20:56.116926+01:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 18245975, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/18245975/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-01T00:20:52.911626+01:00", "action": 53, "target": "", "id": 18245972, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/18245972/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-01T00:19:53.612989+01:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 18245970, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/18245970/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-03-01T00:19:50.211319+01:00", "action": 53, "target": "", "id": 18245967, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/18245967/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-02-28T23:33:39.761831+01:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 18245072, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/18245072/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-02-28T23:33:35.942281+01:00", "action": 53, "target": "", "id": 18245070, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/18245070/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-02-23T15:15:54.877791+01:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt\nAuto-merging fastlane/metadata/fr-FR/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt\nAuto-merging fastlane/metadata/fr-FR/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt\nAuto-merging fastlane/metadata/en-US/promotional_text.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt\nAuto-merging fastlane/metadata/en-US/privacy_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 17785677, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/17785677/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-02-23T15:15:51.008610+01:00", "action": 53, "target": "", "id": 17785675, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/17785675/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-02-22T16:51:04.432491+01:00", "action": 47, "target": "", "id": 17747317, "action_name": "Alert triggered", "url": "https://hosted.weblate.org/api/changes/17747317/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-02-22T16:51:04.340996+01:00", "action": 47, "target": "", "id": 17747316, "action_name": "Alert triggered", "url": "https://hosted.weblate.org/api/changes/17747316/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-02-22T10:12:21.415909+01:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 17721711, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/17721711/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-02-22T10:12:18.162003+01:00", "action": 53, "target": "", "id": 17721707, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/17721707/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/wallabag/ios-app-setting/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-02-22T09:43:28.763392+01:00", "action": 23, "target": "Rebasing (1/213)\nerror: could not apply b601fb4... Release day\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b601fb4... Release day\nCONFLICT (add/add): Merge conflict in wallabagTests/Info.plist\nAuto-merging wallabagTests/Info.plist\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nAuto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nAuto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved\nCONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj\nAuto-merging wallabag.xcodeproj/project.pbxproj\nCONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt\nAuto-merging fastlane/metadata/secondary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt\nAuto-merging fastlane/metadata/primary_category.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt\nAuto-merging fastlane/metadata/fr-FR/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt\nAuto-merging fastlane/metadata/fr-FR/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt\nAuto-merging fastlane/metadata/fr-FR/description.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt\nAuto-merging fastlane/metadata/en-US/support_url.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt\nAuto-merging fastlane/metadata/en-US/release_notes.txt\nCONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt\nAuto-merging fastlane/metadata/copyright.txt\nCONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift\nAuto-merging fastlane/SnapshotHelper.swift\nCONFLICT (add/add): Merge conflict in fastlane/Snapfile\nAuto-merging fastlane/Snapfile\nCONFLICT (add/add): Merge conflict in fastlane/README.md\nAuto-merging fastlane/README.md\nCONFLICT (add/add): Merge conflict in fastlane/Fastfile\nAuto-merging fastlane/Fastfile\nCONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift\nAuto-merging bagit/ShareViewController.swift\nCONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift\nAuto-merging bagit/ShareExtensionError.swift\nCONFLICT (add/add): Merge conflict in bagit/Info.plist\nAuto-merging bagit/Info.plist\nCONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nAuto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift\nAuto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nAuto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/Package.swift\nAuto-merging WallabagKit/Package.swift\nCONFLICT (add/add): Merge conflict in WallabagKit/.gitignore\nAuto-merging WallabagKit/.gitignore\nCONFLICT (add/add): Merge conflict in Gemfile.lock\nAuto-merging Gemfile.lock\nCONFLICT (add/add): Merge conflict in Gemfile\nAuto-merging Gemfile\nCONFLICT (add/add): Merge conflict in .swiftlint.yml\nAuto-merging .swiftlint.yml\nCONFLICT (add/add): Merge conflict in .swift-version\nAuto-merging .swift-version\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\n (1)", "id": 17721354, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/17721354/?format=api" } ] }{ "count": 831, "next": "