3 ms·

Git does support custom merge "drivers" on a per file basis. For example: https://gist.github.com/seanh/378623 https://gist.github.com/seanh/378623

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