Thread: [pgjdbc/pgjdbc] 701892: docs: use union merge strategy for CHANGELOG

[pgjdbc/pgjdbc] 701892: docs: use union merge strategy for CHANGELOG

From

Vladimir Sitnikov

Date:

30 June 2018, 12:47:30

Branch: refs/heads/master
  Home:   https://github.com/pgjdbc/pgjdbc
  Commit: 70189203574d9f0faf37b8a9bcee1d76ffa6b676
      https://github.com/pgjdbc/pgjdbc/commit/70189203574d9f0faf37b8a9bcee1d76ffa6b676
  Author: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M .gitattributes

  Log Message:
  -----------
  docs: use union merge strategy for CHANGELOG

This avoids "conflicts" on CHANGELOG.md changes, including rebase, etc

closes #1107



      **NOTE:** This service been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.