merge=union

I read this blog post which talked about how keeping a CHANGELOG can prevent automatically accepting pull-requests, unless you put something like CHANGELOG.md merge=union in your .gitattributes file. Since this website is all about CHANGELOGs, I think it's worth mentioning somewhere in the site that specifying CHANGELOG.md merge=union is pretty important 😄

Works great on local git, but Github shows merge conflicts. Apparently github's merge tools don't support this. I hope I am wrong...

Reduce CHANGELOG conflicts

Reduce CHANGELOG conflicts (#69)

Stumbled on this a few days ago. It seems like GitHub does not allow this but GitLab might work better (TL:DR).

yes, in gitlab it works now: isaacs/github#487 (comment)

Is there any update for a workaround with GitHub? Even with the .gitattributes fix we are seeing a huge velocity hit by having to update every PR after a Changelog update has been merged.

From GitHub support

Hi AJ,

Thanks for reaching out to GitHub Support!

I'm afraid what you're seeing is currently expected behavior.

GitHub doesn't consider user-defined .gitattributes files (normally, we use our own .gitattrbutes file which you can't change). I agree it would be useful if you could define that yourself and I'll pass your feedback to the team, but I can't promise when such a feature might be available.

The only workaround I could suggest is to merge pull requests in your local clone (and not via the web UI), by using the instructions shown in the merge box for each pull request. It's not a very elegant solution, I agree, but something to consider if this is causing you problems.

Thanks for the feedback here, we really appreciate it. Please feel free to let us know if there is anything else we can help with!

Support automatic changelog merges for locals

As a live test of whether Github UI added support merge=union I created moreati/changelog-merge-test#1, and moreati/changelog-merge-test#2. Based on that I believe (as of 7 Feb 2021) the answer is still no.

Navigation Menu

Repository navigation

merge=union #56

Metadata

Assignees

Labels

Projects

Milestone

Relationships

Development

merge=union #56

Description

Activity

13rac1 commented on May 21, 2015

silenceisgolden commented on Oct 24, 2017

glensc commented on Oct 25, 2017

silenceisgolden commented on Dec 8, 2017

moreati commented on Feb 7, 2021

Metadata

Metadata

Assignees

Labels

Projects

Milestone

Relationships

Development

Issue actions