User avatar None

Repository rebase failed

warning: skipped previously applied commit 3242db8
warning: skipped previously applied commit b08bcb2
warning: skipped previously applied commit ac7dda3
warning: skipped previously applied commit ddba6ca
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging language/lt.json
CONFLICT (add/add): Merge conflict in language/lt.json
error: could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
 (1)
4 months ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-editor-ndla-virtual-tour, master 4 months ago
User avatar None

Repository rebase failed

warning: skipped previously applied commit 3242db8
warning: skipped previously applied commit b08bcb2
warning: skipped previously applied commit ac7dda3
warning: skipped previously applied commit ddba6ca
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging language/lt.json
CONFLICT (add/add): Merge conflict in language/lt.json
error: could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
 (1)
4 months ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-editor-ndla-virtual-tour, master 4 months ago
User avatar None

Repository rebase failed

warning: skipped previously applied commit 3242db8
warning: skipped previously applied commit b08bcb2
warning: skipped previously applied commit ac7dda3
warning: skipped previously applied commit ddba6ca
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging language/lt.json
CONFLICT (add/add): Merge conflict in language/lt.json
error: could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
 (1)
5 months ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-editor-ndla-virtual-tour, master 5 months ago
User avatar None

Repository rebase failed

warning: skipped previously applied commit 3242db8
warning: skipped previously applied commit b08bcb2
warning: skipped previously applied commit ac7dda3
warning: skipped previously applied commit ddba6ca
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging language/lt.json
CONFLICT (add/add): Merge conflict in language/lt.json
error: could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
 (1)
5 months ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-editor-ndla-virtual-tour, master 5 months ago
User avatar None

Repository rebase failed

warning: skipped previously applied commit 3242db8
warning: skipped previously applied commit b08bcb2
warning: skipped previously applied commit ac7dda3
warning: skipped previously applied commit ddba6ca
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging language/lt.json
CONFLICT (add/add): Merge conflict in language/lt.json
error: could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
 (1)
9 months ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-editor-ndla-virtual-tour, master 9 months ago
User avatar None

Alert triggered

Repository outdated. 9 months ago
User avatar None

Repository rebase failed

warning: skipped previously applied commit 3242db8
warning: skipped previously applied commit b08bcb2
warning: skipped previously applied commit ac7dda3
warning: skipped previously applied commit ddba6ca
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging language/lt.json
CONFLICT (add/add): Merge conflict in language/lt.json
error: could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
 (1)
9 months ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-editor-ndla-virtual-tour, master 9 months ago
User avatar None

Component locked

The component was automatically locked because of an alert. 9 months ago
User avatar None

Alert triggered

Could not merge the repository. 9 months ago
User avatar None

Repository rebase failed

warning: skipped previously applied commit 3242db8
warning: skipped previously applied commit b08bcb2
warning: skipped previously applied commit ac7dda3
warning: skipped previously applied commit ddba6ca
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging language/lt.json
CONFLICT (add/add): Merge conflict in language/lt.json
error: could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
 (1)
9 months ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-editor-ndla-virtual-tour, master 9 months ago
User avatar None

Changes committed

Changes committed 10 months ago
User avatar ginpama

Translation approved

10 months ago
User avatar david.song

Changes pushed

Changes pushed 11 months ago

Search