flash_flow 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 684ce44dd9f331aff22691a315db0b43f13978f2
-  data.tar.gz: 5c6d740d61bf5f91f5f9393ce39c3e4bbafc285c
+  metadata.gz: 20fe9b2c9a6e87cc95f3863eef066cf3b2d9e194
+  data.tar.gz: b7f8f0877729bd2647d57382c6c8f29b5f6eaaa3
 SHA512:
-  metadata.gz: bcecfc69cfb664bada29d6bb38e0843e78d4e6c4aaaa7d01bd210607866eaefb1dedbe349606a5e293da3db9f23406c5127e37087f741402c03d3b7edae1fa9f
-  data.tar.gz: 69d94e23707c3cfe788ac7a2f2147f8685d0e5ec69aa65b53f31f23c414c535ef0db1d387f912c28b9740675a435368fd9089d0879f3ba0f087a9a22c2a2512f
+  metadata.gz: f9a074d152af4e9636bcb5da5013d9fecd09b9d419248c4265198c60eab74feb551ba70a959ac2dafe686d0d68fee888ac58ee4748e8cd3702075c391f78fc4f
+  data.tar.gz: 7f361566b040768d30489a18a23c51920bf1e98d4cd3147a9d3dca9575d9684c4377fd3b30eff58cc60d1ff428ff180b52221eeb46f138010d80ec43411b7141

data/.gitignore

@@ -1,3 +1,4 @@
+*.gem
 coverage
 /.bundle
 .env

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flash_flow (1.6.1)
+    flash_flow (1.6.2)
       google-api-client
       mail
       octokit (~> 4.1)

data/lib/flash_flow/git.rb

@@ -182,6 +182,7 @@ module FlashFlow
     end
 
     def copy_temp_to_branch(branch, squash_message = nil)
+      reset_local_merge_branch
       run("checkout #{temp_merge_branch}")
       run("merge --strategy=ours --no-edit #{branch}")
       run("checkout #{branch}")
@@ -190,6 +191,15 @@ module FlashFlow
       squash_commits(branch, squash_message) if squash_message
     end
 
+    def reset_local_merge_branch
+      in_branch(master_branch) do
+        run("branch -D #{merge_branch}")
+        run("checkout -b #{merge_branch}")
+        run("reset --hard #{remote}/#{merge_branch}")
+        run("clean -x -f -d")
+      end
+    end
+
     def delete_temp_merge_branch
       in_branch(master_branch) do
         run("branch -d #{temp_merge_branch}")

data/lib/flash_flow/version.rb

@@ -1,4 +1,4 @@
 module FlashFlow
-  VERSION = '1.6.1'
+  VERSION = '1.6.2'
   GIT_VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flash_flow
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Brad Bennett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit