Automated weekly upstream probe hit conflicts when merging LoopKit/Loop:dev into feat/AllFeatures.
Upstream commit: e3229270a2704a601ef69ed3f407195717d5b09e
Subject: Warn at launch on development (dev branch) builds (LoopKit#2439)
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: e3229270a2704a601ef69ed3f407195717d5b09e
Subject: Warn at launch on development (dev branch) builds (LoopKit#2439)
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