yonaskolb/XcodeGen
1
1
Fork 0
mirror of https://github.com/yonaskolb/XcodeGen.git synced 2024-07-07 09:06:32 +03:00
Code Issues Projects Releases Wiki Activity

add union merge for the changelog

Browse Source
This commit is contained in:
Yonas Kolb 2018-08-02 23:59:42 +10:00
parent 704ad0c41b
commit b918a1e76b
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
CHANGELOG merge=union

5
CONTRIBUTING.md
View File

@ -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.