GitLab best practice: Difference between revisions
m (→Gitlab best practice: adding more external links) |
|||
| Line 6: | Line 6: | ||
* [https://about.gitlab.com/2016/03/08/gitlab-tutorial-its-all-connected/]] | * [https://about.gitlab.com/2016/03/08/gitlab-tutorial-its-all-connected/]] | ||
* [https://docs.gitlab.com/ee/workflow/gitlab_flow.html#merge-pull-requests-with-gitlab-flow] | * [https://docs.gitlab.com/ee/workflow/gitlab_flow.html#merge-pull-requests-with-gitlab-flow] | ||
* [https://about.gitlab.com/2016/10/25/gitlab-workflow-an-overview/] | |||
* [https://about.gitlab.com/2014/09/29/gitlab-flow/] | |||
Git implements distributed repositories, git itself does not even make an assumption about a master repository. It is however good to have such a master repository and dedicated strategy how to contribute to it. | Git implements distributed repositories, git itself does not even make an assumption about a master repository. It is however good to have such a master repository and dedicated strategy how to contribute to it. | ||
| Line 25: | Line 27: | ||
=== Git commits === | === Git commits === | ||
==== Log message format ==== | ==== Log message format ==== | ||
== Handling merge requests == | == Handling merge requests == | ||
=== Automatic merges === | === Automatic merges === | ||
=== Fast-forward merges === | === Fast-forward merges === | ||
Revision as of 22:19, 25 January 2017
Main Page -> Documentation -> Gitlab best practice
Gitlab best practice
This page is a collection of links to Gitlab documentation and will evolve into some guidelines how to use Gitlab within the project.
Git implements distributed repositories, git itself does not even make an assumption about a master repository. It is however good to have such a master repository and dedicated strategy how to contribute to it.
Terminology
- fork: repository copy in a other user space of Gitlab server system
- clone: local working copy on a machine
- merge:
- rebase:
Roles
There are two very different use cases, the
- User role: A user wants to download the code, compile it and use it.
- Developer role: A developer contributes to the development.
The developer fork
The developer fork is the main feature in Gitlabs/Githubs concept of distributed development, code sharing and code review.