Fix variable name and change copy

app/services/files/base_service.rb

@@ -63,7 +63,7 @@ module Files
       end
 
       if !project.empty_repo? && different_branch? && repository.branch_exists?(@branch_name)
-        raise ValidationError, 'Branch with such name already exists. You need to switch to this branch in order to make changes'
+        raise ValidationError, "A branch called #{@branch_name} already exists. Switch to that branch in order to make changes"
       end
     end
 

app/services/git_operation_service.rb

@@ -56,7 +56,7 @@ class GitOperationService
     start_project: repository.project,
     &block)
 
-    start_branch ||= branch_name
+    start_branch_name ||= branch_name
 
     verify_start_branch_exists!(start_project.repository, start_branch_name)