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

ci: resolve merge conflict on main #138

Closed
sliedig opened this issue Aug 1, 2022 · 0 comments
Closed

ci: resolve merge conflict on main #138

sliedig opened this issue Aug 1, 2022 · 0 comments

Comments

@sliedig
Copy link
Contributor

sliedig commented Aug 1, 2022

Branch commit misalignment. Resolve conflict before merge
@amirkaws amirkaws mentioned this issue Aug 1, 2022
Merged
7 tasks
@github-actions github-actions bot added the pending-release Fix or implementation already in dev waiting to be released label Aug 1, 2022
@amirkaws amirkaws closed this as completed Aug 1, 2022
@dreamorosi dreamorosi mentioned this issue Jun 24, 2024
Open
@hjgraca hjgraca removed the pending-release Fix or implementation already in dev waiting to be released label Jul 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@sliedig @hjgraca @amirkaws