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

#173 FIX Better feedback on automerge conflict error #174

Merged
merged 1 commit into from
Dec 13, 2024
Merged

#173 FIX Better feedback on automerge conflict error #174

merged 1 commit into from
Dec 13, 2024

Conversation

orbitz
Copy link
Contributor

@orbitz orbitz commented Dec 13, 2024

Description

Type of change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update
  • Other (explain):

Checklist

  • I have read the contributing guidelines
  • The pull request title follows this format:
    ISSUE_NUMBER ACTION_TYPE Short description (e.g., 123 ADD Feature description)
  • I have added tests and documentation (if applicable)
  • My changes generate no new warnings/errors and do not break existing functionality

Additional context (optional)

@orbitz orbitz requested a review from a team as a code owner December 13, 2024 10:52
@orbitz orbitz merged commit 039ca3f into main Dec 13, 2024
4 checks passed
@orbitz orbitz deleted the 173-fix-give-better-feedback-to-user-on-automerge-conflict branch December 13, 2024 11:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bender2352 bender2352 bender2352 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@orbitz @bender2352