User avatar Moul

Failed rebase on repository

Cesium v2 / git_src_assets_i18n

Rebasing (1/13)
Rebasing (2/13)
Rebasing (3/13)
error: could not apply 709f774... Translated using Weblate (Spanish)
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 709f774... Translated using Weblate (Spanish)
Auto-merging src/assets/i18n/es-ES.json
CONFLICT (content): Merge conflict in src/assets/i18n/es-ES.json
 (1)
3 days ago
User avatar Moul

Translation changed

Cesium v2 / git_src_assets_i18nFrench

3 days ago
User avatar Moul

Component unlocked

Cesium v2 / git_src_assets_i18n

Component unlocked 3 days ago
User avatar Moul

Committed changes

Cesium v2 / git_src_assets_i18nPortuguese

Committed changes 4 days ago
User avatar Moul

Committed changes

Cesium v2 / git_src_assets_i18nGerman

Committed changes 4 days ago
User avatar Moul

Committed changes

Cesium v2 / git_src_assets_i18nDutch

Committed changes 4 days ago
User avatar Moul

Committed changes

Cesium v2 / git_src_assets_i18nItalian

Committed changes 4 days ago
User avatar Moul

Committed changes

Cesium v2 / git_src_assets_i18nSpanish

Committed changes 4 days ago
User avatar Moul

Committed changes

Cesium v2 / git_src_assets_i18nSpanish

Committed changes 4 days ago
User avatar Moul

Committed changes

Cesium v2 / git_src_assets_i18nEsperanto (eo_EO)

Committed changes 4 days ago
User avatar Moul

Committed changes

Cesium v2 / git_src_assets_i18nEnglish (United Kingdom)

Committed changes 4 days ago
User avatar Moul

Committed changes

Cesium v2 / git_src_assets_i18nCatalan

Committed changes 4 days ago
User avatar Moul

Committed changes

Cesium v2 / git_src_assets_i18nFrench

Committed changes 4 days ago
User avatar Moul

Committed changes

Cesium v2 / git_src_assets_i18nSpanish

Committed changes 4 days ago
User avatar None

New alert

TRM / principe-de-resonance-psychologique-les-bulles-sont-une-consequence-de-l-emission-monetaire-asymetri

Repository has changes. 4 days ago
User avatar None

New alert

TRM / remerciements

Repository has changes. 4 days ago
User avatar None

New alert

TRM / masse-monetaire-et-relativite

Repository has changes. 4 days ago
User avatar None

New alert

TRM / comment-comparer-deux-zones-economiques

Repository has changes. 4 days ago
User avatar None

New alert

TRM / precedentes-publications

Repository has changes. 4 days ago
User avatar None

New alert

TRM / appendice-1

Repository has changes. 4 days ago

Search