theo lem
@theolem Joined on June 22, 2020
1 translation
| Project | Translated | Unfinished | Unfinished words | Unfinished characters | Untranslated | Checks | Suggestions | Comments | |
|---|---|---|---|---|---|---|---|---|---|
| Yakforms | 84% | 454 | 5,146 | 29,959 | 440 | 139 | 2 | 0 | |
|
|
|||||||||
 theolem
Rebased repository |
Rebased repository
2 years ago
|
|
theolem
Component unlocked |
Component unlocked
2 years ago
|
|
theolem
Component locked |
Component locked
2 years ago
|
|
theolem
Component locked |
Component locked
2 years ago
|
|
theolem
Component locked |
Component locked
2 years ago
|
|
theolem
Component locked |
Component locked
2 years ago
|
|
theolem
Component unlocked |
Component unlocked
2 years ago
|
|
theolem
Component unlocked |
Component unlocked
2 years ago
|
|
theolem
Failed rebase on repository |
First, rewinding head to replay your work on top of it... Applying: Fix logging of form deletion Using index info to reconstruct a base tree... M sites/all/modules/framaforms/includes/framaforms.expiration.inc M sites/all/modules/framaforms/includes/framaforms.util.inc Falling back to patching base and 3-way merge... Auto-merging sites/all/modules/framaforms/includes/framaforms.expiration.inc CONFLICT (content): Merge conflict in sites/all/modules/framaforms/includes/framaforms.expiration.inc error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Fix logging of form deletion 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)2 years ago |
|
theolem
Failed rebase on repository |
First, rewinding head to replay your work on top of it... Applying: Fix logging of form deletion Using index info to reconstruct a base tree... M sites/all/modules/framaforms/includes/framaforms.expiration.inc M sites/all/modules/framaforms/includes/framaforms.util.inc Falling back to patching base and 3-way merge... Auto-merging sites/all/modules/framaforms/includes/framaforms.expiration.inc CONFLICT (content): Merge conflict in sites/all/modules/framaforms/includes/framaforms.expiration.inc error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Fix logging of form deletion 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)2 years ago |