diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-10-16 21:29:45 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-10-16 22:05:24 +0300 |
commit | 9f7a7115a4c7b90e0203516f5aabf913ce02cbfe (patch) | |
tree | 6ae8abe8c0808a3449ac4569effa0532fd03c3ff /doc | |
parent | f1fd2e4bab5485dc5b2073b7589378cd6c259cfb (diff) |
Convert CHANGELOG to Markdown
All this does is convert the version sections into headers. The list
items shouldn't really be indented by two spaces, but it makes no
difference to the rendering and this way we retain authorship history
for the actual changes.
Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29
Diffstat (limited to 'doc')
-rw-r--r-- | doc/workflow/gitlab_flow.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md index 7c0eb90d540..2215f37b81a 100644 --- a/doc/workflow/gitlab_flow.md +++ b/doc/workflow/gitlab_flow.md @@ -228,7 +228,7 @@ We'll discuss the three reasons to merge in master: leveraging code, merge confl If you need to leverage some code that was introduced in master after you created the feature branch you can sometimes solve this by just cherry-picking a commit. If your feature branch has a merge conflict, creating a merge commit is a normal way of solving this. You can prevent some merge conflicts by using [gitattributes](http://git-scm.com/docs/gitattributes) for files that can be in a random order. -For example in GitLab our changelog file is specified in .gitattributes as `CHANGELOG merge=union` so that there are fewer merge conflicts in it. +For example in GitLab our changelog file is specified in .gitattributes as `CHANGELOG.md merge=union` so that there are fewer merge conflicts in it. The last reason for creating merge commits is having long lived branches that you want to keep up to date with the latest state of the project. Martin Fowler, in [his article about feature branches](http://martinfowler.com/bliki/FeatureBranch.html) talks about this Continuous Integration (CI). At GitLab we are guilty of confusing CI with branch testing. Quoting Martin Fowler: "I've heard people say they are doing CI because they are running builds, perhaps using a CI server, on every branch with every commit. |