home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 03:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dmitriy Zaporozhets
2014-01-10 08:00:31 +00:00
parent 54bcbba538 f46620e6f4
commit a67f3c393f
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/projects/merge_requests/show/_how_to_merge.html.haml
+18 -18
View File
@@ -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
%pre.dark
:preserve
git merge #{source_remote}/#{@merge_request.source_branch}
git push #{target_remote} #{@merge_request.target_branch}
- else
%p
%strong Step 1.
Checkout target branch and get recent objects from GitLab
Merge the branch and push the changes to GitLab
%pre.dark
:preserve
git checkout #{@merge_request.target_branch}
git fetch origin
git merge --no-ff #{@merge_request.source_project_path}-#{@merge_request.source_branch}
git push origin #{@merge_request.target_branch}
- else
%p
%strong Step 2.
Merge source branch into target branch and push changes to GitLab
%strong Step 1.
Update the repo and checkout the branch we are going to merge
%pre.dark
:preserve
git merge origin/#{@merge_request.source_branch}
git fetch origin
git checkout -b #{@merge_request.source_branch} origin/#{@merge_request.source_branch}
%p
%strong Step 2.
Merge the branch and push the changes to GitLab
%pre.dark
:preserve
git checkout #{@merge_request.target_branch}
git merge --no-ff #{@merge_request.source_branch}
git push origin #{@merge_request.target_branch}