git_commands 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13ca5fec82febdad4d82a8646490fea282ee1580
-  data.tar.gz: f42e6593a54309fa6efa2fb0e779f179b6600492
+  metadata.gz: baabb6478e302d5050b50566ddfd3e38958ee4a3
+  data.tar.gz: 2c06bbd9b921c91107eeb6b12c95889c7f9f47e8
 SHA512:
-  metadata.gz: 3b22a5ab76a7338167a5ad00b9f8e4d1e0e036626f12e9400b47f9f0d531d532a68a01ad3edd102bd280cb91800b5fcb95a407a1f4b2bf69d066a12b6d0316be
-  data.tar.gz: 9233e1627bbbb488cddb1452fba6948895f8603918b5e07cff258f3bad855df1cfe7de9f99c8447618e97964a6e8279ecc42cc87142d059eb4b3b3b0f047e500
+  metadata.gz: 86f2412d9bc44fb5ee1b3175b1c88b426299230f8df87b427bdddf2ee4483e03ad75a53923c18cf949f8f07a23c7d3774ff608a96773970c36e9bc56ff456578
+  data.tar.gz: 59af36fad13ba69931447df792d2374e9c4eac131b8673827e31e7cd7b956ac52ad361a503bcea8673b12b910658d41e2b1fc772c66e9b45cf12591ef4d4f3d1

data/lib/git_commands/command.rb

@@ -100,6 +100,7 @@ module GitCommands
 
     private def delete_conflictual
       return if @conflictual.empty?
+      `git checkout #{Branch::MASTER}`
       @conflictual.each do |branch|
         `git branch -D #{branch}`
       end

data/lib/git_commands/version.rb

@@ -1,3 +1,3 @@
 module GitCommands
-  VERSION = "3.2.2"
+  VERSION = "3.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_commands
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - costajob