From b918a1e76b4b98883de2a8ba99a5dbce435764f8 Mon Sep 17 00:00:00 2001 From: Yonas Kolb Date: Thu, 2 Aug 2018 23:59:42 +1000 Subject: [PATCH] add union merge for the changelog --- .gitattributes | 1 + CONTRIBUTING.md | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..89e130e0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CHANGELOG merge=union diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f88d19d6..8d936d4a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -57,3 +57,8 @@ As part of the tests there is a [TestProject](/Tests/Fixtures/TestProject) fixtu > Note that sometimes having the `TestProject` open in Xcode will generate it's own diffs, so make sure to have it closed when running the tests. If your change contains any new features or logic changes please add a unit test of your own to cover it. If it's a new feature, see if it can be integrated into the `TestProject` by adding any required files and then editing the [project spec](/Tests/Fixtures/TestProject/project.yml). + +### Submitting your PR +Please give a small summary of what has changed. Also add any github issues links (`Resolves #100`). + +Once your PR is created, please add a changelog entry to [CHANGELOG.md](/CHANGELOG.md) along with the PR number.