From 0769dd2b2f407d4b4b7f2864eb8690cd631c345b Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 3 Mar 2016 18:06:11 -0800 Subject: [PATCH] fix release script --- bin/freeside-debian-releases.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/freeside-debian-releases.sh b/bin/freeside-debian-releases.sh index e832d9176..03a163a79 100755 --- a/bin/freeside-debian-releases.sh +++ b/bin/freeside-debian-releases.sh @@ -27,7 +27,9 @@ rm -fr $DIR/freeside/debian/freeside-ng-selfservice.conffiles # Pull any changes cd $DIR/freeside -STATUS=`git pull` +git checkout -- debian/changelog +git pull +#STATUS=`git pull` #Assign the proper config files for freeside-ng-selfservice if [ $DISTRO = "wheezy" ]; then -- 2.11.0