diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2017-11-28 23:16:18 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-11-28 19:05:04 -0800 |
| commit | 6437a2e18e9464162395bc0dd5b5f4754efc7d93 (patch) | |
| tree | 021ded145edcc8481a75b09a00fdfdff487defae /.github/PULL_REQUEST_TEMPLATE.md | |
| parent | d031fbf2ea034c484dbb08e49310ae85adfeadef (diff) | |
| download | subsurface-6437a2e18e9464162395bc0dd5b5f4754efc7d93.tar.gz | |
release-notes: use CHANGELOG.md
Add a file CHANGELOG.md in the root Subsurface directory
and track this file with the `-text merge=union` attribute.
This prevents merge conflicts if release notes are added
on top of the file by different commits.
Also, make ReleaseNotes/ReleaseNotes.txt point to that file.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Diffstat (limited to '.github/PULL_REQUEST_TEMPLATE.md')
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7ba3fe91f..c8555c152 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -27,8 +27,8 @@ <!-- Include sample dive log or other relevant information to allow testing the change where feasible. --> ### Release note: -<!-- Describe if this change needs a release note present in ReleaseNotes/ReleaseNotes.txt. --> -<!-- Also, please make sure to update the ReleaseNotes/ReleaseNotes.txt file itself. --> +<!-- Describe if this change needs a release note present in CHANGELOG.md. --> +<!-- Also, please make sure to add the release note on top of the file CHANGELOG.md. --> ### Documentation change: <!-- If this PR makes changes to user functionality, then the documentation has to be updated too. --> |