Skip to content

Upstream merge conflict — LoopKit/Loop@e959503 #12

Open

Description

@github-actions

Automated weekly upstream probe hit conflicts when merging LoopKit/Loop:dev into feat/AllFeatures.

Upstream commit: e959503b18a3138890cd4a91d66a5af654eb543f
Subject: Submit issue reports to the LoopKit developers; require iOS 17.6 (LoopKit#2586)
Triggered by: upstream-probe.yml (Mondays 06:00 UTC)

Resolve manually:

git checkout feat/AllFeatures
git fetch upstream dev
git merge upstream/dev
# resolve conflicts
git push origin feat/AllFeatures

Activity

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

Metadata

Metadata

Assignees

No one assigned

    Labels

    upstream-merge-conflictWeekly upstream-probe workflow hit a conflict merging LoopKit/Loop:main

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions