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

From: Vladimir Sitnikov <sitnikov(dot)vladimir(at)gmail(dot)com>
To: pgsql-jdbc(at)postgresql(dot)org
Subject: [pgjdbc/pgjdbc] 701892: docs: use union merge strategy for CHANGELOG
Date: 2018-06-30 06:47:30
Message-ID: 5b372782552a7_10952ab7928afc045825@hookshot-fe-b0febf1.cp1-iad.github.net.mail
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-jdbc

Branch: refs/heads/master
Home: https://github.com/pgjdbc/pgjdbc
Commit: 70189203574d9f0faf37b8a9bcee1d76ffa6b676
https://github.com/pgjdbc/pgjdbc/commit/70189203574d9f0faf37b8a9bcee1d76ffa6b676
Author: Vladimir Sitnikov <sitnikov(dot)vladimir(at)gmail(dot)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.

Browse pgsql-jdbc by date

  From Date Subject
Next Message Stephen Nelson 2018-06-30 07:30:43 [pgjdbc/pgjdbc] e9ced4: chore: add missing javadoc tags to avoid warnings ...
Previous Message Vladimir Sitnikov 2018-06-29 20:25:19 [pgjdbc/pgjdbc] 177f63: perf: improve performance of replacing JDBC {...} ...