Commit a67f3c39 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parents 54bcbba5 f46620e6
...@@ -10,34 +10,34 @@ ...@@ -10,34 +10,34 @@
- target_remote = @merge_request.target_project.namespace.nil? ? "target" :@merge_request.target_project.namespace.path - target_remote = @merge_request.target_project.namespace.nil? ? "target" :@merge_request.target_project.namespace.path
%p %p
%strong Step 1. %strong Step 1.
Checkout target branch and get recent objects from GitLab Checkout the branch we are going to merge and pull in the code
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}
%pre.dark %pre.dark
:preserve :preserve
git checkout #{target_remote} #{@merge_request.target_branch} git checkout -b #{@merge_request.source_project_path}-#{@merge_request.source_branch} #{@merge_request.target_branch}
git fetch #{source_remote} git pull #{@merge_request.source_project.http_url_to_repo} #{@merge_request.source_branch}
%p %p
%strong Step 2. %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 %pre.dark
:preserve :preserve
git merge #{source_remote}/#{@merge_request.source_branch} git checkout #{@merge_request.target_branch}
git push #{target_remote} #{@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 - else
%p %p
%strong Step 1. %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 %pre.dark
:preserve :preserve
git checkout #{@merge_request.target_branch}
git fetch origin git fetch origin
git checkout -b #{@merge_request.source_branch} origin/#{@merge_request.source_branch}
%p %p
%strong Step 2. %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 %pre.dark
:preserve :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} git push origin #{@merge_request.target_branch}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment