201: Avoid merge conflicts on your CHANGELOG with scriv - Ned Batchelder
Test & Code
00:00
How to Use a Merge Tool to Make Changes
A merge tool is never going to get that right. The workflow is when I make a change, for some reason, when do I add the little blur but the little extra thing? So go into your pull request. In script terms you would use the scrivcreate command and it would make a new fragment file in your changelog.d directory or whatever it's called. That file would be added to your git commit and it would be part of your commit. It would then become part of your pull request which was reviewed by someone. There's a categorization of the entries that should happen that isn't based on strict chronology - this might actually go towards problems with merge tools
Transcript
Play full episode
