git_commands 3.2.2 → 3.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/git_commands/command.rb +1 -0
  3. data/lib/git_commands/version.rb +1 -1
  4. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 13ca5fec82febdad4d82a8646490fea282ee1580
4
- data.tar.gz: f42e6593a54309fa6efa2fb0e779f179b6600492
3
+ metadata.gz: baabb6478e302d5050b50566ddfd3e38958ee4a3
4
+ data.tar.gz: 2c06bbd9b921c91107eeb6b12c95889c7f9f47e8
5
5
  SHA512:
6
- metadata.gz: 3b22a5ab76a7338167a5ad00b9f8e4d1e0e036626f12e9400b47f9f0d531d532a68a01ad3edd102bd280cb91800b5fcb95a407a1f4b2bf69d066a12b6d0316be
7
- data.tar.gz: 9233e1627bbbb488cddb1452fba6948895f8603918b5e07cff258f3bad855df1cfe7de9f99c8447618e97964a6e8279ecc42cc87142d059eb4b3b3b0f047e500
6
+ metadata.gz: 86f2412d9bc44fb5ee1b3175b1c88b426299230f8df87b427bdddf2ee4483e03ad75a53923c18cf949f8f07a23c7d3774ff608a96773970c36e9bc56ff456578
7
+ data.tar.gz: 59af36fad13ba69931447df792d2374e9c4eac131b8673827e31e7cd7b956ac52ad361a503bcea8673b12b910658d41e2b1fc772c66e9b45cf12591ef4d4f3d1
data/lib/git_commands/command.rb CHANGED
@@ -100,6 +100,7 @@ module GitCommands
100
100
 
101
101
  private def delete_conflictual
102
102
  return if @conflictual.empty?
103
+ `git checkout #{Branch::MASTER}`
103
104
  @conflictual.each do |branch|
104
105
  `git branch -D #{branch}`
105
106
  end
data/lib/git_commands/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module GitCommands
2
- VERSION = "3.2.2"
2
+ VERSION = "3.2.3"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git_commands
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.2
4
+ version: 3.2.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - costajob