lib/gitx/cli/integrate_command.rb in gitx-3.0.2 vs lib/gitx/cli/integrate_command.rb in gitx-3.1.0.ci.216.1

@@ -39,10 +39,10 @@
 
       def integrate_branch(branch, integration_branch, pull_request)
         fetch_remote_branch(integration_branch)
         begin
           run_git_cmd 'merge', '--no-ff', '--message', commit_message(branch, integration_branch, pull_request), branch
-        rescue
+        rescue Gitx::Executor::ExecutionError
           raise MergeError, "Merge conflict occurred.  Please fix merge conflict and rerun command with --resume #{branch} flag"
         end
         run_git_cmd 'push', 'origin', 'HEAD'
       end