diff options
Diffstat (limited to 'bin/pre-generate')
| -rwxr-xr-x | bin/pre-generate | 1 |
1 files changed, 1 insertions, 0 deletions
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 ) |