2 ms·
We did this before but it is a lot of work to come up with good descriptions, you really need to go understand each merge. Different people have merged differen
by sytse 12y ago
We did this before but it is a lot of work to come up with good descriptions, you really need to go understand each merge. Different people have merged different code and sometimes you already forgot what it was about. Also, the days just before release are already very busy.
There was a great comment on the article itself https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/#comment-1846082669 https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-con... just using .gitattributes with `CHANGELOG merge=union` might do the trick