New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consider adding merge=union flags for changelog kind of files #1107

Closed
vlsi opened this Issue Feb 11, 2018 · 0 comments

Comments

Projects
None yet
1 participant
@vlsi
Member

vlsi commented Feb 11, 2018

@vlsi vlsi closed this in 7018920 Jun 30, 2018

rhavermans added a commit to bolcom/pgjdbc that referenced this issue Jul 13, 2018

docs: use union merge strategy for CHANGELOG
This avoids "conflicts" on CHANGELOG.md changes, including rebase, etc

closes pgjdbc#1107

rhavermans added a commit to bolcom/pgjdbc that referenced this issue Jul 13, 2018

docs: use union merge strategy for CHANGELOG
This avoids "conflicts" on CHANGELOG.md changes, including rebase, etc

closes pgjdbc#1107
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment