From 6fc329d2e53b6caef91db91b360f28c9d14460a3 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 7 Aug 2024 12:53:01 +0200 Subject: [PATCH] Merge branch 158 --- birdnet-pi/Dockerfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/birdnet-pi/Dockerfile b/birdnet-pi/Dockerfile index 778d3441a..d92825c10 100644 --- a/birdnet-pi/Dockerfile +++ b/birdnet-pi/Dockerfile @@ -103,6 +103,20 @@ RUN \ apt-get clean all && \ rm -rf /var/lib/apt/lists/* +# Add PR +RUN \ + cd /home/pi/BirdNET-pi && \ + git fetch origin pull/158/head:158 && \ + git checkout main && \ + git branch -D f-merge-prs || true && \ + git checkout -b f-merge-prs && \ + git merge 158 --no-edit && \ + git stash && \ + git checkout main && \ + git merge f-merge-prs && \ + git branch -d f-merge-prs && \ + git branch -d 158 + # Update with my repo if more recent #WORKDIR /home/pi #RUN \