Determine / Implement `CHANGELOG.md` strategy for `1.x` (main) && `2.x` to avoid merge conflicts when merging "up"

SymfonyCasts / verify-email-bundle

Simple, stylish Email Verification for Symfony

https://symfonycasts.com

MIT License

408 stars 33 forks source link

Determine / Implement `CHANGELOG.md` strategy for `1.x` (main) && `2.x` to avoid merge conflicts when merging "up" #162

Closed jrushlow closed 7 months ago

jrushlow commented 8 months ago

How should we handle the changelog going forward. e.g. CHANGELOG-1.x.md && CHANGELOG-2.x.md? I feel like keeping a single CHANGELOG.md will cause merge conflicts but I could be wrong.

This strategy would also apply to reset-password-bundle when it comes up for a version bump.

cc @weaverryan @bocharsky-bw

weaverryan commented 8 months ago

I see the problem... but I'm not sure it'll be so bad, as we won't be developing SO much in the older branches. I say we keep it simple with just CHANGELOG.md and deal with any conflicts. They should be easy to solve.

bocharsky-bw commented 7 months ago

Agree with Ryan

jrushlow commented 7 months ago

sounds good to me! fixed in #173