Skip to content

Upstream merge conflict — LoopKit/Loop@2b4cd9a #9

Open

Description

@github-actions

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

Upstream commit: 2b4cd9a2feaeccf2c5c527a730d406b4d4ceb0c0
Subject: Updated translations from lokalise on Thu Sep 10 13:42:39 PDT 2026 (LoopKit#2505)
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

  1. github-actions commented on Oct 15, 2026

    @github-actions
    Author

    This issue is stale because it has been open for 30 days with no 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

    staleupstream-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