From f50a64d85007a222751826136d51b0a3e99ec36e Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Fri, 31 Mar 2017 11:51:19 +0200
Subject: [PATCH] Merge conflicts.

---
 packages/dipendenze_pacchetti           | 7 +++++++
 tools/autobuilder/debian_tobeupdated.sh | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/packages/dipendenze_pacchetti b/packages/dipendenze_pacchetti
index 9dda930..5295ae5 100644
--- a/packages/dipendenze_pacchetti
+++ b/packages/dipendenze_pacchetti
@@ -51,6 +51,8 @@
 
 - libzakautho (develop)
 
+- libzakauthogui (develop)
+
 - libzakgtkdecoder (develop)
 
 - libzakformgtkdecoder (master)
@@ -62,6 +64,11 @@
   - libzakform
   - libzakutils
 
+- libzakformhashtable (master)
+  - libzakform
+
+- libzakaudit (gtk3)
+
 - territorio (develop)
   - libgdaex
   - libgdaexgrid
diff --git a/tools/autobuilder/debian_tobeupdated.sh b/tools/autobuilder/debian_tobeupdated.sh
index 1cec85a..e211c2d 100755
--- a/tools/autobuilder/debian_tobeupdated.sh
+++ b/tools/autobuilder/debian_tobeupdated.sh
@@ -15,10 +15,15 @@ UPSTREAM_BRANCH=`sed -n -e 's/^\s*upstream-branch\s*=\s*//p' debian/gbp.conf`
 
 echo "Upstream branch: "$UPSTREAM_BRANCH
 
+# update current branch
+git pull -r --autostash
+
 # update upstream branch
+git stash save
 git checkout $UPSTREAM_BRANCH
 git pull
 git checkout $CURRENT_BRANCH
+git stash pop
 
 # not empty if there's at least one commit be merged
 TO_BE_MERGED=`git log --pretty=oneline --graph ..$UPSTREAM_BRANCH | head -n 1 | sed -n -e 's/\* //p'`
-- 
2.49.0