Merge branch 'need-merge-commit' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents 54bcbba5 f46620e6
Showing 1 changed file with 12 additions and 12 deletions Show diff stats
app/views/projects/merge_requests/show/_how_to_merge.html.haml
@@ -10,34 +10,34 @@
           - target_remote = @merge_request.target_project.namespace.nil? ? "target" :@merge_request.target_project.namespace.path
           %p
             %strong Step 1.
-            Checkout target branch and get recent objects from GitLab
-            Assuming remote for  #{@merge_request.target_project.path_with_namespace} is called #{target_remote}
-            remote for  #{@merge_request.source_project_path} is called #{source_remote}
+            Checkout the branch we are going to merge and pull in the code
           %pre.dark
             :preserve
-              git checkout #{target_remote} #{@merge_request.target_branch}
-              git fetch #{source_remote}
+              git checkout -b #{@merge_request.source_project_path}-#{@merge_request.source_branch} #{@merge_request.target_branch}
+              git pull #{@merge_request.source_project.http_url_to_repo} #{@merge_request.source_branch}
           %p
             %strong Step 2.
-            Merge source branch into target branch and push changes to GitLab
+            Merge the branch and push the changes to GitLab
           %pre.dark
             :preserve
-              git merge #{source_remote}/#{@merge_request.source_branch}
-              git push #{target_remote} #{@merge_request.target_branch}
+              git checkout #{@merge_request.target_branch}
+              git merge --no-ff #{@merge_request.source_project_path}-#{@merge_request.source_branch}
+              git push origin #{@merge_request.target_branch}
         - else
           %p
             %strong Step 1.
-            Checkout target branch and get recent objects from GitLab
+            Update the repo and checkout the branch we are going to merge
           %pre.dark
             :preserve
-              git checkout #{@merge_request.target_branch}
               git fetch origin
+              git checkout -b #{@merge_request.source_branch} origin/#{@merge_request.source_branch}
           %p
             %strong Step 2.
-            Merge source branch into target branch and push changes to GitLab
+            Merge the branch and push the changes to GitLab
           %pre.dark
             :preserve
-              git merge origin/#{@merge_request.source_branch}
+              git checkout #{@merge_request.target_branch}
+              git merge --no-ff #{@merge_request.source_branch}
               git push origin #{@merge_request.target_branch}