From f1cbfc17933b8d0f6d7d77cc14f5db69c9c019e3 Mon Sep 17 00:00:00 2001 From: Raspbian automatic git importer Date: Sat, 3 Mar 2018 14:45:01 +0000 Subject: [PATCH] Make stage1 merge in "packaging" branch. --- debian/buildnewlinuxpackage/buildnewlinuxpackage-stage1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage1 b/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage1 index 743ca591db9b..906d0ef862b6 100755 --- a/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage1 +++ b/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage1 @@ -15,6 +15,9 @@ git config --local user.name "Raspbian kernel package updater" git config --local user.email root@raspbian.org git config merge.conflictstyle diff3 +#merge any changes from "packaging" branch +git merge --no-edit packaging + #merge in existing packaging git merge buildnewlinuxpackage-deb || true -- 2.30.2