User avatar None

Failed rebase on repository

pretix / pretix.eu Hosted service

First, rewinding head to replay your work on top of it...
Applying: Translated on translate.pretix.eu (Arabic)
Using index info to reconstruct a base tree...
M	pretixeu/pretixeu/locale/ar/LC_MESSAGES/django.po
Falling back to patching base and 3-way merge...
Auto-merging pretixeu/pretixeu/locale/ar/LC_MESSAGES/django.po
Applying: Translated on translate.pretix.eu (German (informal))
Using index info to reconstruct a base tree...
M	pretixeu/pretixeu/locale/de_Informal/LC_MESSAGES/django.po
Falling back to patching base and 3-way merge...
Auto-merging pretixeu/pretixeu/locale/de_Informal/LC_MESSAGES/django.po
CONFLICT (content): Merge conflict in pretixeu/pretixeu/locale/de_Informal/LC_MESSAGES/django.po
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 Translated on translate.pretix.eu (German (informal))

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".

 (1)
23 minutes ago
User avatar None

Received repository notification

pretix / pretix.eu Hosted service

GitLab: https://code.rami.io/pretix/pretixeu, master 23 minutes ago
User avatar None

Failed rebase on repository

pretix / pretix.eu Hosted service

First, rewinding head to replay your work on top of it...
Applying: Translated on translate.pretix.eu (Arabic)
Using index info to reconstruct a base tree...
M	pretixeu/pretixeu/locale/ar/LC_MESSAGES/django.po
Falling back to patching base and 3-way merge...
Auto-merging pretixeu/pretixeu/locale/ar/LC_MESSAGES/django.po
Applying: Translated on translate.pretix.eu (German (informal))
Using index info to reconstruct a base tree...
M	pretixeu/pretixeu/locale/de_Informal/LC_MESSAGES/django.po
Falling back to patching base and 3-way merge...
Auto-merging pretixeu/pretixeu/locale/de_Informal/LC_MESSAGES/django.po
CONFLICT (content): Merge conflict in pretixeu/pretixeu/locale/de_Informal/LC_MESSAGES/django.po
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 Translated on translate.pretix.eu (German (informal))

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".

 (1)
24 minutes ago
User avatar None

Received repository notification

pretix / pretix.eu Hosted service

GitLab: https://code.rami.io/pretix/pretixeu, master 24 minutes ago
User avatar None

Failed rebase on repository

pretix / pretix.eu Hosted service

First, rewinding head to replay your work on top of it...
Applying: Translated on translate.pretix.eu (Arabic)
Using index info to reconstruct a base tree...
M	pretixeu/pretixeu/locale/ar/LC_MESSAGES/django.po
Falling back to patching base and 3-way merge...
Auto-merging pretixeu/pretixeu/locale/ar/LC_MESSAGES/django.po
Applying: Translated on translate.pretix.eu (German (informal))
Using index info to reconstruct a base tree...
M	pretixeu/pretixeu/locale/de_Informal/LC_MESSAGES/django.po
Falling back to patching base and 3-way merge...
Auto-merging pretixeu/pretixeu/locale/de_Informal/LC_MESSAGES/django.po
CONFLICT (content): Merge conflict in pretixeu/pretixeu/locale/de_Informal/LC_MESSAGES/django.po
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 Translated on translate.pretix.eu (German (informal))

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".

 (1)
37 minutes ago
User avatar None

Pushed changes

pretix / pretix

Pushed changes 38 minutes ago
User avatar None

Rebased repository

pretix / pretix

Rebased repository 38 minutes ago
User avatar None

Received repository notification

pretix / pretix

GitHub: https://github.com/pretix/pretix, master 38 minutes ago
User avatar None

Pushed changes

pretix / pretixSCAN (Android)

Pushed changes an hour ago
User avatar None

Pushed changes

pretix / pretix Plugin: Service Fees

Pushed changes an hour ago
User avatar None

Pushed changes

pretix / pretix Plugin: Sofort

Pushed changes an hour ago
User avatar None

Pushed changes

pretix / pretix Plugin: Bounces

Pushed changes an hour ago
User avatar None

Pushed changes

pretix / pretixSCAN (iOS)

Pushed changes an hour ago
Pushed changes an hour ago
User avatar None

Pushed changes

pretix / pretix Plugin: Saferpay

Pushed changes an hour ago
User avatar None

Pushed changes

pretix / pretix Plugin: Passbook

Pushed changes an hour ago
User avatar None

Failed push on repository

pretix / pretix Plugin: Cart sharing

Repository was archived so is read-only.
an hour ago
User avatar None

Pushed changes

pretix / pretix Plugin: Venueless

Pushed changes an hour ago
User avatar None

Pushed changes

pretix / pretixSCAN (Desktop)

Pushed changes an hour ago
User avatar None

Pushed changes

pretix / pretix Plugin: Stay22

Pushed changes an hour ago

Search