From ba9ac03fa46acc13e689d056bfd4ba7b98eaca75 Mon Sep 17 00:00:00 2001 From: rkiel Date: Sat, 6 Jun 2015 08:28:49 -0400 Subject: [PATCH] test-unmerged-changes: swap delete order for end --- lib/feature/end.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/feature/end.rb b/lib/feature/end.rb index b688312..b6c7fa3 100644 --- a/lib/feature/end.rb +++ b/lib/feature/end.rb @@ -24,12 +24,12 @@ module Feature git_checkout standard_branch + git_local_branch_delete feature_branch + if remote_branch(feature_branch) != "" git_remote_branch_delete feature_branch end - git_local_branch_delete feature_branch - git_prune end end