diff options
Diffstat (limited to 'bin/pre-generate')
| -rwxr-xr-x | bin/pre-generate | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/pre-generate b/bin/pre-generate index bd1c21e..ece3385 100755 --- a/bin/pre-generate +++ b/bin/pre-generate @@ -24,6 +24,8 @@ if [[ $branch == master ]]; then git add . git commit -m "make: $msg" + git checkout pre-generated + git checkout pre-generated.tmp git merge --no-edit -s ours pre-generated git checkout pre-generated git merge pre-generated.tmp |