theolem
Dépôt rebasé |
Dépôt rebasé
Il y a 3 ans
|
theolem
Le composant est déverrouillé |
Le composant est déverrouillé
Il y a 3 ans
|
theolem
Le composant est verrouillé |
Le composant est verrouillé
Il y a 3 ans
|
theolem
Le composant est verrouillé |
Le composant est verrouillé
Il y a 3 ans
|
theolem
Le composant est verrouillé |
Le composant est verrouillé
Il y a 3 ans
|
theolem
Le composant est verrouillé |
Le composant est verrouillé
Il y a 3 ans
|
theolem
Le composant est déverrouillé |
Le composant est déverrouillé
Il y a 3 ans
|
theolem
Le composant est déverrouillé |
Le composant est déverrouillé
Il y a 3 ans
|
theolem
Échec du rebasement du dépôt |
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)Il y a 3 ans |
theolem
Échec du rebasement du dépôt |
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)Il y a 3 ans |