Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve automerge action to resolve conflicts in go.mod automatically #82

Open
sol-0 opened this issue Dec 27, 2021 · 0 comments
Open

Improve automerge action to resolve conflicts in go.mod automatically #82

sol-0 opened this issue Dec 27, 2021 · 0 comments
Assignees
@NikitaSkrynnik

Comments

@sol-0
Copy link

sol-0 commented Dec 27, 2021

In case of parallel updates in parent repositories (e.g. sdk, sdk-k8s, etc.) dependency versions in go.mod in cmd-* repositories might end up in conflicting state.

We can enhance automerge job to try resolving such conflicts automatically by adding the latest dependency versions in go.mod.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@NikitaSkrynnik NikitaSkrynnik

Labels
None yet
Projects
Release 1.3.0
Status: No status
Milestone
No milestone
Development

No branches or pull requests
2 participants
@NikitaSkrynnik @sol-0