socialcast-git-extensions 0.10.1 → 0.10.2

data/VERSION

@@ -1 +1 @@
-0.10.1
+0.10.2

data/lib/socialcast-git-extensions.rb

@@ -72,11 +72,13 @@ module Socialcast
   end
 
   def reset_branch(branch)
-    run_cmd "git branch -D #{branch}" rescue nil
-    run_cmd "git push origin :#{branch}"
     run_cmd "git checkout master"
+    run_cmd "git pull"
+    run_cmd "git branch -D #{branch}" rescue nil
+    run_cmd "git push origin :#{branch}" rescue nil
     run_cmd "git checkout -b #{branch}"
     run_cmd "grb publish #{branch}"
+    run_cmd "git checkout master"
   end
 
   def integrate(branch, destination_branch = 'staging')

data/socialcast-git-extensions.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{socialcast-git-extensions}
-  s.version = "0.10.1"
+  s.version = "0.10.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Sonnek"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 10
-  - 1
-  version: 0.10.1
+  - 2
+  version: 0.10.2
 platform: ruby
 authors: 
 - Ryan Sonnek