Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
f46620e6
Commit
f46620e6
authored
Jan 09, 2014
by
dosire
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Instead of working with remotes Dmitriy suggested to use urls.
parent
09eccf47
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
13 deletions
+9
-13
app/views/projects/merge_requests/show/_how_to_merge.html.haml
...iews/projects/merge_requests/show/_how_to_merge.html.haml
+9
-13
No files found.
app/views/projects/merge_requests/show/_how_to_merge.html.haml
View file @
f46620e6
...
...
@@ -10,23 +10,19 @@
-
target_remote
=
@merge_request
.
target_project
.
namespace
.
nil?
?
"target"
:
@merge_request
.
target_project
.
namespace
.
path
%p
%strong
Step 1.
Update the repo and checkout the branch we are going to merge
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 fetch
#{
source_remote
}
git fetch
#{
target_remote
}
git checkout -b {@merge_request.source_branch}
#{
source_remote
}
/
#{
@merge_request
.
source_branch
}
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 the
source branch into target branch and push
changes to GitLab
Merge the
branch and push the
changes to GitLab
%pre
.dark
:preserve
git checkout
#{
target_remote
}
/
#{
@merge_request
.
target_branch
}
git merge --no-ff
#{
@merge_request
.
source_branch
}
git push
#{
target_remote
}
#{
@merge_request
.
target_branch
}
git branch -d {@merge_request.source_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.
...
...
@@ -34,10 +30,10 @@
%pre
.dark
:preserve
git fetch origin
git checkout -b
#{
@merge_request
.
source_branch
}
git checkout -b
#{
@merge_request
.
source_branch
}
origin/
#{
@merge_request
.
source_branch
}
%p
%strong
Step 2.
Merge the
source branch into target branch and push
changes to GitLab
Merge the
branch and push the
changes to GitLab
%pre
.dark
:preserve
git checkout
#{
@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