Component | Translated | Unfinished | Unfinished words | Unfinished characters | Untranslated | Checks | Suggestions | Comments | |
---|---|---|---|---|---|---|---|---|---|
App (Android) GPL-3.0 | 51% | 5,745 | 30,324 | 184,947 | 4,871 | 236 | 61 | 2 | |
|
|||||||||
App (iOS)
|
44% | 546 | 1,504 | 8,572 | 545 | 35 | 81 | 0 | |
|
|||||||||
App setting (iOS)
|
49% | 228 | 409 | 2,544 | 228 | 0 | 2 | 2 | |
|
|||||||||
Config (web)
|
70% | 379 | 1,834 | 11,226 | 379 | 3 | 4 | 0 | |
|
|||||||||
Messages (web) MIT | 60% | 7,950 | 47,405 | 291,779 | 7,950 | 28 | 8 | 0 | |
|
|||||||||
User (web)
|
75% | 60 | 471 | 2,588 | 60 | 0 | 3 | 0 | |
|
|||||||||
Validators (web)
|
65% | 73 | 532 | 2,950 | 56 | 2 | 0 | 0 | |
|
|||||||||
Wallabagger MIT | 33% | 1,712 | 7,060 | 40,801 | 1,712 | 23 | 1 | 0 | |
|
|||||||||
Glossary wallabag GPL-3.0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | ||
|
Overview
Project website | www.wallabag.org |
---|---|
Project maintainers |
![]() ![]() ![]() ![]() ![]() ![]() ![]() |
Translation license | GPL-3.0 App (Android) wallabag MIT App (iOS) App setting (iOS) Config (web) Messages (web) User (web) Validators (web) Wallabagger |
String statistics
Strings percent | Hosted strings | Words percent | Hosted words | Characters percent | Hosted characters | |
---|---|---|---|---|---|---|
Total | 37,806 | 186,624 | 1,137,652 | |||
Source | 1,116 | 5,400 | 32,906 | |||
Translated | 55% | 21,113 | 52% | 97,085 | 52% | 592,245 |
Needs editing | 2% | 892 | 4% | 7,621 | 4% | 45,904 |
Read-only | 1% | 472 | 1% | 1,668 | 1% | 11,778 |
Failing checks | 1% | 327 | 1% | 2,721 | 1% | 16,893 |
Strings with suggestions | 1% | 160 | 1% | 755 | 1% | 4,410 |
Untranslated strings | 41% | 15,801 | 43% | 81,918 | 43% | 499,503 |
Quick numbers
186 k
Hosted words
37,806
Hosted strings
55%
Translated
4
Contributors
and previous 30 days
Trends of last 30 days
+2%
Hosted words
—
+2%
Hosted strings
—
−1%
Translated
—
—
Contributors
−100%
![]() Failed rebase on repository |
12 days ago
|
![]() Failed rebase on repository |
Rebasing (1/218) CONFLICT (add/add): Merge conflict in wallabagTests/Info.plist Auto-merging wallabagTests/Info.plist CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme Auto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved Auto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj Auto-merging wallabag.xcodeproj/project.pbxproj CONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt Auto-merging fastlane/metadata/secondary_category.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt Auto-merging fastlane/metadata/primary_category.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt Auto-merging fastlane/metadata/fr-FR/support_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt Auto-merging fastlane/metadata/fr-FR/release_notes.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt Auto-merging fastlane/metadata/fr-FR/promotional_text.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt Auto-merging fastlane/metadata/fr-FR/privacy_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt Auto-merging fastlane/metadata/fr-FR/description.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt Auto-merging fastlane/metadata/en-US/support_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt Auto-merging fastlane/metadata/en-US/release_notes.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt Auto-merging fastlane/metadata/en-US/promotional_text.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt Auto-merging fastlane/metadata/en-US/privacy_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt Auto-merging fastlane/metadata/copyright.txt CONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift Auto-merging fastlane/SnapshotHelper.swift CONFLICT (add/add): Merge conflict in fastlane/Snapfile Auto-merging fastlane/Snapfile CONFLICT (add/add): Merge conflict in fastlane/README.md Auto-merging fastlane/README.md CONFLICT (add/add): Merge conflict in fastlane/Fastfile Auto-merging fastlane/Fastfile CONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift Auto-merging bagit/ShareViewController.swift CONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift Auto-merging bagit/ShareExtensionError.swift CONFLICT (add/add): Merge conflict in bagit/Info.plist Auto-merging bagit/Info.plist CONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift Auto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKitError.swift Auto-merging WallabagKit/Sources/WallabagKit/WallabagKitError.swift CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift Auto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift Auto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift CONFLICT (add/add): Merge conflict in WallabagKit/Package.swift Auto-merging WallabagKit/Package.swift CONFLICT (add/add): Merge conflict in WallabagKit/.gitignore Auto-merging WallabagKit/.gitignore CONFLICT (add/add): Merge conflict in README.md Auto-merging README.md CONFLICT (add/add): Merge conflict in Gemfile.lock Auto-merging Gemfile.lock CONFLICT (add/add): Merge conflict in Gemfile Auto-merging Gemfile CONFLICT (add/add): Merge conflict in .swiftlint.yml Auto-merging .swiftlint.yml CONFLICT (add/add): Merge conflict in .swift-version Auto-merging .swift-version COerror: could not apply b601fb4... Release day Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b601fb4... Release day NFLICT (add/add): Merge conflict in .gitignore Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .github/workflows/swift.yml Auto-merging .github/workflows/swift.yml CONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE.md Auto-merging .github/ISSUE_TEMPLATE.md (1)12 days ago |
![]() Received repository notification |
GitHub: https://github.com/wallabag/ios-app, main
12 days ago
|
![]() Received repository notification |
GitHub: https://github.com/wallabag/ios-app, main
12 days ago
|
![]() Failed rebase on repository |
Rebasing (1/215) CONFLICT (add/add): Merge conflict in wallabagTests/Info.plist Auto-merging wallabagTests/Info.plist CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme Auto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved Auto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj Auto-merging wallabag.xcodeproj/project.pbxproj CONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt Auto-merging fastlane/metadata/secondary_category.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt Auto-merging fastlane/metadata/primary_category.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt Auto-merging fastlane/metadata/fr-FR/support_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt Auto-merging fastlane/metadata/fr-FR/release_notes.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt Auto-merging fastlane/metadata/fr-FR/promotional_text.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt Auto-merging fastlane/metadata/fr-FR/privacy_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt Auto-merging fastlane/metadata/fr-FR/description.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt Auto-merging fastlane/metadata/en-US/support_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt Auto-merging fastlane/metadata/en-US/release_notes.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt Auto-merging fastlane/metadata/en-US/promotional_text.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt Auto-merging fastlane/metadata/en-US/privacy_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt Auto-merging fastlane/metadata/copyright.txt CONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift Auto-merging fastlane/SnapshotHelper.swift CONFLICT (add/add): Merge conflict in fastlane/Snapfile Auto-merging fastlane/Snapfile CONFLICT (add/add): Merge conflict in fastlane/README.md Auto-merging fastlane/README.md CONFLICT (add/add): Merge conflict in fastlane/Fastfile Auto-merging fastlane/Fastfile CONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift Auto-merging bagit/ShareViewController.swift CONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift Auto-merging bagit/ShareExtensionError.swift CONFLICT (add/add): Merge conflict in bagit/Info.plist Auto-merging bagit/Info.plist CONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift Auto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKitError.swift Auto-merging WallabagKit/Sources/WallabagKit/WallabagKitError.swift CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift Auto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift Auto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift CONFLICT (add/add): Merge conflict in WallabagKit/Package.swift Auto-merging WallabagKit/Package.swift CONFLICT (add/add): Merge conflict in WallabagKit/.gitignore Auto-merging WallabagKit/.gitignore CONFLICT (add/add): Merge conflict in README.md Auto-merging README.md CONFLICT (add/add): Merge conflict in Gemfile.lock Auto-merging Gemfile.lock CONFLICT (add/add): Merge conflict in Gemfile Auto-merging Gemfile CONFLICT (add/add): Merge conflict in .swiftlint.yml Auto-merging .swiftlint.yml CONFLICT (add/add): Merge conflict in .swift-version Auto-merging .swift-version COerror: could not apply b601fb4... Release day Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b601fb4... Release day NFLICT (add/add): Merge conflict in .gitignore Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .github/workflows/swift.yml Auto-merging .github/workflows/swift.yml CONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE.md Auto-merging .github/ISSUE_TEMPLATE.md (1)12 days ago |
![]() Failed rebase on repository |
Rebasing (1/218) CONFLICT (add/add): Merge conflict in wallabagTests/Info.plist Auto-merging wallabagTests/Info.plist CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme Auto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved Auto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj Auto-merging wallabag.xcodeproj/project.pbxproj CONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt Auto-merging fastlane/metadata/secondary_category.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt Auto-merging fastlane/metadata/primary_category.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt Auto-merging fastlane/metadata/fr-FR/support_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt Auto-merging fastlane/metadata/fr-FR/release_notes.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt Auto-merging fastlane/metadata/fr-FR/promotional_text.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt Auto-merging fastlane/metadata/fr-FR/privacy_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt Auto-merging fastlane/metadata/fr-FR/description.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt Auto-merging fastlane/metadata/en-US/support_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt Auto-merging fastlane/metadata/en-US/release_notes.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt Auto-merging fastlane/metadata/en-US/promotional_text.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt Auto-merging fastlane/metadata/en-US/privacy_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt Auto-merging fastlane/metadata/copyright.txt CONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift Auto-merging fastlane/SnapshotHelper.swift CONFLICT (add/add): Merge conflict in fastlane/Snapfile Auto-merging fastlane/Snapfile CONFLICT (add/add): Merge conflict in fastlane/README.md Auto-merging fastlane/README.md CONFLICT (add/add): Merge conflict in fastlane/Fastfile Auto-merging fastlane/Fastfile CONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift Auto-merging bagit/ShareViewController.swift CONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift Auto-merging bagit/ShareExtensionError.swift CONFLICT (add/add): Merge conflict in bagit/Info.plist Auto-merging bagit/Info.plist CONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift Auto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKitError.swift Auto-merging WallabagKit/Sources/WallabagKit/WallabagKitError.swift CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift Auto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift Auto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift CONFLICT (add/add): Merge conflict in WallabagKit/Package.swift Auto-merging WallabagKit/Package.swift CONFLICT (add/add): Merge conflict in WallabagKit/.gitignore Auto-merging WallabagKit/.gitignore CONFLICT (add/add): Merge conflict in README.md Auto-merging README.md CONFLICT (add/add): Merge conflict in Gemfile.lock Auto-merging Gemfile.lock CONFLICT (add/add): Merge conflict in Gemfile Auto-merging Gemfile CONFLICT (add/add): Merge conflict in .swiftlint.yml Auto-merging .swiftlint.yml CONFLICT (add/add): Merge conflict in .swift-version Auto-merging .swift-version COerror: could not apply b601fb4... Release day Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b601fb4... Release day NFLICT (add/add): Merge conflict in .gitignore Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .github/workflows/swift.yml Auto-merging .github/workflows/swift.yml CONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE.md Auto-merging .github/ISSUE_TEMPLATE.md (1)12 days ago |
![]() Received repository notification |
GitHub: https://github.com/wallabag/ios-app, main
12 days ago
|
![]() Received repository notification |
GitHub: https://github.com/wallabag/ios-app, main
12 days ago
|
![]() Failed rebase on repository |
Rebasing (1/218) CONFLICT (add/add): Merge conflict in wallabagTests/Info.plist Auto-merging wallabagTests/Info.plist CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme Auto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved Auto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj Auto-merging wallabag.xcodeproj/project.pbxproj CONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt Auto-merging fastlane/metadata/secondary_category.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt Auto-merging fastlane/metadata/primary_category.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt Auto-merging fastlane/metadata/fr-FR/support_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt Auto-merging fastlane/metadata/fr-FR/release_notes.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt Auto-merging fastlane/metadata/fr-FR/promotional_text.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt Auto-merging fastlane/metadata/fr-FR/privacy_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt Auto-merging fastlane/metadata/fr-FR/description.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt Auto-merging fastlane/metadata/en-US/support_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt Auto-merging fastlane/metadata/en-US/release_notes.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt Auto-merging fastlane/metadata/en-US/promotional_text.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt Auto-merging fastlane/metadata/en-US/privacy_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt Auto-merging fastlane/metadata/copyright.txt CONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift Auto-merging fastlane/SnapshotHelper.swift CONFLICT (add/add): Merge conflict in fastlane/Snapfile Auto-merging fastlane/Snapfile CONFLICT (add/add): Merge conflict in fastlane/README.md Auto-merging fastlane/README.md CONFLICT (add/add): Merge conflict in fastlane/Fastfile Auto-merging fastlane/Fastfile CONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift Auto-merging bagit/ShareViewController.swift CONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift Auto-merging bagit/ShareExtensionError.swift CONFLICT (add/add): Merge conflict in bagit/Info.plist Auto-merging bagit/Info.plist CONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift Auto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKitError.swift Auto-merging WallabagKit/Sources/WallabagKit/WallabagKitError.swift CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift Auto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift Auto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift CONFLICT (add/add): Merge conflict in WallabagKit/Package.swift Auto-merging WallabagKit/Package.swift CONFLICT (add/add): Merge conflict in WallabagKit/.gitignore Auto-merging WallabagKit/.gitignore CONFLICT (add/add): Merge conflict in README.md Auto-merging README.md CONFLICT (add/add): Merge conflict in Gemfile.lock Auto-merging Gemfile.lock CONFLICT (add/add): Merge conflict in Gemfile Auto-merging Gemfile CONFLICT (add/add): Merge conflict in .swiftlint.yml Auto-merging .swiftlint.yml CONFLICT (add/add): Merge conflict in .swift-version Auto-merging .swift-version COerror: could not apply b601fb4... Release day Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b601fb4... Release day NFLICT (add/add): Merge conflict in .gitignore Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE.md Auto-merging .github/ISSUE_TEMPLATE.md (1)12 days ago |
![]() Failed rebase on repository |
Rebasing (1/215) CONFLICT (add/add): Merge conflict in wallabagTests/Info.plist Auto-merging wallabagTests/Info.plist CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme Auto-merging wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved Auto-merging wallabag.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved CONFLICT (add/add): Merge conflict in wallabag.xcodeproj/project.pbxproj Auto-merging wallabag.xcodeproj/project.pbxproj CONFLICT (add/add): Merge conflict in fastlane/metadata/secondary_category.txt Auto-merging fastlane/metadata/secondary_category.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/primary_category.txt Auto-merging fastlane/metadata/primary_category.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/support_url.txt Auto-merging fastlane/metadata/fr-FR/support_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/release_notes.txt Auto-merging fastlane/metadata/fr-FR/release_notes.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/promotional_text.txt Auto-merging fastlane/metadata/fr-FR/promotional_text.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/privacy_url.txt Auto-merging fastlane/metadata/fr-FR/privacy_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/fr-FR/description.txt Auto-merging fastlane/metadata/fr-FR/description.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/support_url.txt Auto-merging fastlane/metadata/en-US/support_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/release_notes.txt Auto-merging fastlane/metadata/en-US/release_notes.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/promotional_text.txt Auto-merging fastlane/metadata/en-US/promotional_text.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/en-US/privacy_url.txt Auto-merging fastlane/metadata/en-US/privacy_url.txt CONFLICT (add/add): Merge conflict in fastlane/metadata/copyright.txt Auto-merging fastlane/metadata/copyright.txt CONFLICT (add/add): Merge conflict in fastlane/SnapshotHelper.swift Auto-merging fastlane/SnapshotHelper.swift CONFLICT (add/add): Merge conflict in fastlane/Snapfile Auto-merging fastlane/Snapfile CONFLICT (add/add): Merge conflict in fastlane/README.md Auto-merging fastlane/README.md CONFLICT (add/add): Merge conflict in fastlane/Fastfile Auto-merging fastlane/Fastfile CONFLICT (add/add): Merge conflict in bagit/ShareViewController.swift Auto-merging bagit/ShareViewController.swift CONFLICT (add/add): Merge conflict in bagit/ShareExtensionError.swift Auto-merging bagit/ShareExtensionError.swift CONFLICT (add/add): Merge conflict in bagit/Info.plist Auto-merging bagit/Info.plist CONFLICT (add/add): Merge conflict in WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift Auto-merging WallabagKit/Tests/WallabagKitTests/WallabagKitTests.swift CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKitError.swift Auto-merging WallabagKit/Sources/WallabagKit/WallabagKitError.swift CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/WallabagKit.swift Auto-merging WallabagKit/Sources/WallabagKit/WallabagKit.swift CONFLICT (add/add): Merge conflict in WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift Auto-merging WallabagKit/Sources/WallabagKit/Endpoint/WallabagOAuth.swift CONFLICT (add/add): Merge conflict in WallabagKit/Package.swift Auto-merging WallabagKit/Package.swift CONFLICT (add/add): Merge conflict in WallabagKit/.gitignore Auto-merging WallabagKit/.gitignore CONFLICT (add/add): Merge conflict in README.md Auto-merging README.md CONFLICT (add/add): Merge conflict in Gemfile.lock Auto-merging Gemfile.lock CONFLICT (add/add): Merge conflict in Gemfile Auto-merging Gemfile CONFLICT (add/add): Merge conflict in .swiftlint.yml Auto-merging .swiftlint.yml CONFLICT (add/add): Merge conflict in .swift-version Auto-merging .swift-version COerror: could not apply b601fb4... Release day Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b601fb4... Release day NFLICT (add/add): Merge conflict in .gitignore Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE.md Auto-merging .github/ISSUE_TEMPLATE.md (1)12 days ago |