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

Do not error if automerge fails due to a conflict #173

Closed
orbitz opened this issue Dec 13, 2024 · 0 comments
Closed

Do not error if automerge fails due to a conflict #173

orbitz opened this issue Dec 13, 2024 · 0 comments
Labels
bug Something isn't working

Comments

@orbitz
Copy link
Contributor

orbitz commented Dec 13, 2024

Describe the bug

The terrateam server logs get a lot of errors for conflict failure

Steps to reproduce

No response

Expected behavior

No response

Actual behavior

No response

Terrateam version & environment details

No response

Additional context

No response
@orbitz orbitz added the bug Something isn't working label Dec 13, 2024
orbitz added a commit that referenced this issue Dec 13, 2024
@orbitz
#173 FIX Better feedback on automerge conflict error
64e4b75
orbitz added a commit that referenced this issue Dec 13, 2024
@orbitz
Merge pull request #174 from terrateamio/173-fix-give-better-feedback…
039ca3f 
…-to-user-on-automerge-conflict

#173 FIX Better feedback on automerge conflict error
@orbitz orbitz closed this as completed Dec 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@orbitz