Automated weekly upstream probe hit conflicts when merging LoopKit/Loop:dev into feat/AllFeatures.
Upstream commit: 715b7ca788f6597d0e29a591b4dd503f1f50f519
Subject: Xcode 27 Build Support (LoopKit#2458)
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
Automated weekly upstream probe hit conflicts when merging
LoopKit/Loop:devintofeat/AllFeatures.Upstream commit: 715b7ca788f6597d0e29a591b4dd503f1f50f519
Subject: Xcode 27 Build Support (LoopKit#2458)
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