diff options
| author | Sytse Sijbrandij <sytses@gmail.com> | 2014-09-08 14:11:21 +0200 |
|---|---|---|
| committer | Sytse Sijbrandij <sytses@gmail.com> | 2014-09-08 14:11:21 +0200 |
| commit | 8088d22d4177d23369775ed93968c45b0ec84eec (patch) | |
| tree | 120cf7e07005bb7f469fcbab1669a76d5a54ada1 /CONTRIBUTING.md | |
| parent | 0bb1e4b5c0f37cac5cf50ca37d358bfd34effb8d (diff) | |
| download | gitlab-ce-8088d22d4177d23369775ed93968c45b0ec84eec.tar.gz | |
Insert at a random point in the changelog to prevent conflicts.
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f02ba2216d2..beb5a3903d6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -61,7 +61,7 @@ If you can, please submit a merge request with the fix or improvements including 1. Fork the project on GitLab Cloud 1. Create a feature branch 1. Write [tests](README.md#run-the-tests) and code -1. Add your changes to the [CHANGELOG](CHANGELOG) +1. Add your changes to the [CHANGELOG](CHANGELOG) insert your line at a [random point](doc/workflow/gitlab_flow.md#do-not-order-commits-with-rebase) in the current version 1. If you have multiple commits please combine them into one commit by [squashing them](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) 1. Push the commit to your fork 1. Submit a merge request (MR) to the master branch |