Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
773b8adbc232
Commit
a67f3c39
authored
Jan 10, 2014
by
Dmitriy Zaporozhets
Browse files
Merge branch 'need-merge-commit' of /home/git/repositories/gitlab/gitlabhq
parents
c1fa5b1035ef
22f2f44b8359
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/views/projects/merge_requests/show/_how_to_merge.html.haml
View file @
773b8adb
...
...
@@ -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.
C
heckout t
arget
branch
and get recent objects from GitLab
Update the repo and c
heckout t
he
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
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment