Skip to content

Revert "[WIP] this is still an issue 403ef77884af93395415db954299a6fbc435bdad Merge pull request #303 from LoopKit/hotfix/3.6.47d15e1b59c17df15844fb7c3467611019e98569c shift build action time to hh:33ae49141863c3f4ff52ad71f15944a82b7d9a82ea Bump main version to 3...." #4

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
Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Revert "[WIP] this is still an issue 403ef77884af93395415db954299a6fbc435bdad Merge pull request #303 from LoopKit/hotfix/3.6.47d15e1b59c17df15844fb7c3467611019e98569c shift build action time to hh:33ae49141863c3f4ff52ad71f15944a82b7d9a82ea Bump main version to 3...." #4

wants to merge 1 commit into from

Conversation

abmeks
Copy link
Owner

@abmeks abmeks commented Aug 23, 2025

Reverts #3

@abmeks
Revert "[WIP] this is still an issue 403ef77 Merge pull request LoopK…
ee1c1c9 
…it#303 from LoopKit/hotfix/3.6.4

7d15e1b shift build action time to hh:33
ae49141 Bump main version to 3...."
abmeks
abmeks commented Aug 23, 2025
View reviewed changes
Copy link
Owner Author

@abmeks abmeks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is still an issue From https://github.com/LoopKit/LoopWorkspace

  • branch main -> FETCH_HEAD
    Auto-merging .github/workflows/build_loop.yml
    Auto-merging fastlane/Fastfile
    CONFLICT (content): Merge conflict in fastlane/Fastfile
    Automatic merge failed; fix conflicts and then commit the result.
    ERROR: exit 1
    New commits could not be pulled.
    Try running in test mode to verify your action input. If that does not help, please open an issue.
    Resetting git config to previous settings.
    Reset Complete

Error: The process '/bin/sh' failed with exit code 1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@abmeks