3 ms·
I wonder if it would be sufficient to set the changelog's merge strategy to union in .gitattributes.
by slavik81 10y ago
I wonder if it would be sufficient to set the changelog's merge strategy to union in .gitattributes.
- hadley 10y agoI've tried this - it helps, but it's not a silver bullet. (And GitHub doesn't use it in PRs)