diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2015-02-12 20:05:36 +0000 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2015-02-12 20:05:36 +0000 |
| commit | d899bc914f07ce47b5962563467790c25ba52c89 (patch) | |
| tree | d8dc5ecda94e4e460f38a13ded127bb2dad91520 /app/controllers/snippets_controller.rb | |
| parent | 714ca5189ee6da5f25d7930b48d8216aa4eb936e (diff) | |
| parent | 4377ba1c360cf6f4d15e3b5ad2a7ed7bc41f795e (diff) | |
| download | gitlab-ce-d899bc914f07ce47b5962563467790c25ba52c89.tar.gz | |
Merge branch 'gitattributes-merge-union' into 'master'
Use gitattribute merge=union to reduce CHANGELOG merge conflicts.
See gitlab/organization#137.
Tested and found working!
@sytse How would you like to address this in [the article](https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/)? Simply replace "Thanks ayufan, we'll try this instead." by "Thanks ayufan, we've implemented this instead."?
See merge request !1505
Diffstat (limited to 'app/controllers/snippets_controller.rb')
0 files changed, 0 insertions, 0 deletions