Any kotlin team members here? The kotlin project h...
# randomc
Colton Idle
08/31/2021, 7:27 AMAny kotlin team members here? The kotlin project has a super nice changelog on every release. Any tips on how to avoid merge conflict hell with everyone updating changelog.md with their PRs?
m
mickeelm
08/31/2021, 8:26 AMWho updates changelog.md in a PR?
e
elizarov
08/31/2021, 9:14 AMChangeLog is added with each release by a person doing release. No conflicts.
✅ 5
l
louiscad
08/31/2021, 11:53 AMFor refreshVersions and Splitties, I update the changelog (its [Unreleased] section) regularly on the main branch (which is not the release branch), which means I often do it after merging PRs. That's been working well.
c
Colton Idle
08/31/2021, 2:19 PMAh, so no one has had to resort to this?
https://about.gitlab.com/blog/2018/07/03/solving-gitlabs-changelog-conflict-crisis/
2 Views