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
When trying to release OpenTelemetry Collector Contrib v0.41.0, once dealing with #46 manually, I ran into the following problem. I noticed that the branch was identical to the state of my workspace after the last run of the multimod. Is this the reason for the failure?
===== Module Set: contrib-base =====
Updating versions for module set...
Updating all module versions in go.mod files...
git branch prerelease_contrib-base_v0.41.0
Committing changes to git with message 'Prepare contrib-base for version v0.41.0'
commitChangesToNewBranch failed: could not commit changes: could not commit changes to git: branch config: invalid merge
make: *** [Makefile:302: multimod-prerelease] Error 1
$ git st
On branch prerelease_contrib-base_v0.41.0
nothing to commit, working tree clean
$ git version
git version 2.33.1
$ git log -1
commit fc4a73eb9ebdeb02c38e67eca9f0f160fa4ae464 (HEAD -> prerelease_contrib-base_v0.41.0, jpkrohling/core/issue4523)
Author: Juraci Paixão Kröhling <[email protected]>
Date: Thu Dec 9 10:46:18 2021 +0100
gomodtidy
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
The text was updated successfully, but these errors were encountered:
I also ran into this while doing the opentelemetry-collector v0.47.0 release. I fixed it by nuking the repo and cloning again, but I am not sure why that solved the problem.
When trying to release OpenTelemetry Collector Contrib v0.41.0, once dealing with #46 manually, I ran into the following problem. I noticed that the branch was identical to the state of my workspace after the last run of the multimod. Is this the reason for the failure?
The text was updated successfully, but these errors were encountered: