Commit d2fffff0 authored by Job van der Voort's avatar Job van der Voort

Merge branch 'add-mr' into 'master'

New doc about creating a Merge Request in GitLab Basics

Added new doc about creating a new branch.

See merge request !1917
parents 25d9a7f5 e72e721f
...@@ -19,3 +19,5 @@ Step-by-step guides on the basics of working with Git and GitLab. ...@@ -19,3 +19,5 @@ Step-by-step guides on the basics of working with Git and GitLab.
* [Fork a project](fork-project.md) * [Fork a project](fork-project.md)
* [Add a file](add-file.md) * [Add a file](add-file.md)
* [Create a Merge Request](add-merge-request.md)
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
You can create a file in your [shell](command-line-commands.md) or in GitLab. You can create a file in your [shell](command-line-commands.md) or in GitLab.
To create a file in GitLab, sign in to [GitLab.com](https://gitlab.com). To create a file in GitLab, sign in to GitLab.
Select a project on the right side of your screen: Select a project on the right side of your screen:
......
# How to create a merge request
Merge Requests are useful to integrate separate changes that you've made to a project, on different branches.
To create a new Merge Request, sign in to GitLab.
Go to the project where you'd like to merge your changes:
![Select a project](basicsimages/select_project.png)
Click on "Merge Requests" on the left side of your screen:
![Merge requests](basicsimages/merge_requests.png)
Click on "+ new Merge Request" on the right side of the screen:
![New Merge Request](basicsimages/new_merge_request.png)
Select a source branch or branch:
![Select a branch](basicsimages/select_branch.png)
Click on the "compare branches" button:
![Compare branches](basicsimages/compare_branches.png)
Add a title and a description to your Merge Request:
![Add a title and description](basicsimages/title_description_mr.png)
Select a user to review your Merge Request and to accept or close it. You may also select milestones and labels (they are optional). Then click on the "submit new Merge Request" button:
![Add a new merge request](basicsimages/add_new_merge_request.png)
Your Merge Request will be ready to be approved and published.
### Note
After you created a new branch, you'll immediately find a "create a Merge Request" button at the top of your screen.
You may automatically create a Merge Request from your recently created branch when clicking on this button:
![Automatic MR button](basicsimages/button-create-mr.png)
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
## Start working on your project ## Start working on your project
In Git, when you copy a project you say you "clone" it. To work on a git project locally (from your own computer), you will need to clone it. To do this, sign in to [GitLab.com](https://gitlab.com). In Git, when you copy a project you say you "clone" it. To work on a git project locally (from your own computer), you will need to clone it. To do this, sign in to GitLab.
When you are on your Dashboard, click on the project that you'd like to clone, which you'll find at the right side of your screen. When you are on your Dashboard, click on the project that you'd like to clone, which you'll find at the right side of your screen.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
## Create a group ## Create a group
Your projects in [GitLab.com](https://gitlab.com) can be organized in 2 different ways: Your projects in GitLab can be organized in 2 different ways:
under your own namespace for single projects, such as ´your-name/project-1'; or under groups. under your own namespace for single projects, such as ´your-name/project-1'; or under groups.
If you organize your projects under a group, it works like a folder. You can manage your group members' permissions and access to the projects. If you organize your projects under a group, it works like a folder. You can manage your group members' permissions and access to the projects.
......
# How to create a project in GitLab # How to create a project in GitLab
To create a new project, sign in to [GitLab.com](https://gitlab.com). To create a new project, sign in to GitLab.
Go to your Dashboard and click on "new project" on the right side of your screen. Go to your Dashboard and click on "new project" on the right side of your screen.
......
...@@ -6,7 +6,7 @@ You need to connect your computer to your GitLab account through SSH Keys. They ...@@ -6,7 +6,7 @@ You need to connect your computer to your GitLab account through SSH Keys. They
Create an account on GitLab. Sign up and check your email for your confirmation link. Create an account on GitLab. Sign up and check your email for your confirmation link.
After you confirm, go to [GitLab.com](https://about.gitlab.com/) and sign in to your account. After you confirm, go to GitLab and sign in to your account.
## Add your SSH Key ## Add your SSH Key
......
...@@ -6,7 +6,7 @@ publishing or not, without affecting your original project. ...@@ -6,7 +6,7 @@ publishing or not, without affecting your original project.
It takes just a few steps to fork a project in GitLab. It takes just a few steps to fork a project in GitLab.
Sign in to [gitlab.com](https://gitlab.com). Sign in to GitLab.
Select a project on the right side of your screen: Select a project on the right side of your screen:
......
# Start using Git on the command line # Start using Git on the command line
If you want to start using a Git and GitLab, make sure that you have created an account on [GitLab.com](https://about.gitlab.com/). If you want to start using a Git and GitLab, make sure that you have created an account on GitLab.
## Open a shell ## Open a shell
......
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