serettig
Changes pushed |
Changes pushed
2 years ago
|
serettig
Changes pushed |
Changes pushed
2 years ago
|
None
Component unlocked |
Fixing an alert automatically unlocked the component.
2 years ago
|
serettig
Repository rebase failed |
Rebasing (1/2) Rebasing (2/2) error: could not apply 6e10c71... rename pt-br 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 6e10c71... rename pt-br CONFLICT (rename/add): Rename language/pt-BR.json->language/pt-br.json in 6e10c71 (rename pt-br). Added language/pt-br.json in HEAD Auto-merging language/pt-br.json (1)2 years ago |
None
Component locked |
The component was automatically locked because of an alert.
2 years ago
|
None
Alert triggered |
Could not merge the repository.
2 years ago
|
serettig
Repository rebase failed |
Rebasing (1/2) Rebasing (2/2) error: could not apply 7f5fda6... rename pt-br 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 7f5fda6... rename pt-br CONFLICT (rename/add): Rename language/pt-BR.json->language/pt-br.json in 7f5fda6 (rename pt-br). Added language/pt-br.json in HEAD Auto-merging language/pt-br.json (1)2 years ago |