You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
GitLab mirroring is failing, at least for Dev due to a the codebase diverging.
# git.kube.v1.colab.coop:22 SSH-2.0-GitLab-SSHD
# git.kube.v1.colab.coop:22 SSH-2.0-GitLab-SSHD
# git.kube.v1.colab.coop:22 SSH-2.0-GitLab-SSHD
# git.kube.v1.colab.coop:22 SSH-2.0-GitLab-SSHD
# git.kube.v1.colab.coop:22 SSH-2.0-GitLab-SSHD
From git.kube.v1.colab.coop:iris/iris-accessibility
* branch development -> FETCH_HEAD
* [new branch] development -> gitlab/development
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
Error: Process completed with exit code 128.
This has actually been failing since Jan 27, 2025 but was just noticed today. There was a change pushed directly to the GitLab instance on Jan 25, 2025. Which likely accounts for the diverged codebase.
Prerequisites
Describe the bug
GitLab mirroring is failing, at least for Dev due to a the codebase diverging.
See: https://github.com/accessibility-exchange/platform/actions/runs/13654326754/job/38169764057
This has actually been failing since Jan 27, 2025 but was just noticed today. There was a change pushed directly to the GitLab instance on Jan 25, 2025. Which likely accounts for the diverged codebase.
To Reproduce
Merge any changes to dev and notice the Mirror dev to GitLab action is failing.
Expected behavior
The GitHub hosted branches for dev, staging, and production should be mirrored in the GitLab instances without any errors.
Screenshots
No response
Details
Additional context
No response
The text was updated successfully, but these errors were encountered: