From d00bf3265f192c93b0a15c8ac22cb11f8b10ccb8 Mon Sep 17 00:00:00 2001 From: Andrew Murrell Date: Thu, 19 Jan 2017 22:43:55 +0000 Subject: added git pull to pre-generate --- bin/pre-generate | 1 + 1 file changed, 1 insertion(+) (limited to 'bin') diff --git a/bin/pre-generate b/bin/pre-generate index ece3385..e5f8f5e 100755 --- a/bin/pre-generate +++ b/bin/pre-generate @@ -28,6 +28,7 @@ if [[ $branch == master ]]; then git checkout pre-generated.tmp git merge --no-edit -s ours pre-generated git checkout pre-generated + git pull git merge pre-generated.tmp git branch -d pre-generated.tmp ) -- cgit v1.2.3