-
-
Notifications
You must be signed in to change notification settings - Fork 4
/
.gitattributes.example
36 lines (33 loc) · 1.15 KB
/
.gitattributes.example
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
* text=auto
/.github export-ignore
/docs export-ignore
/examples export-ignore
/tests export-ignore
/.dockerignore export-ignore
/.drone.yml export-ignore
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.gitmodules export-ignore
/.php_cs export-ignore
/.doctum.php export-ignore
/.styleci.yml export-ignore
/CHANGELOG.md export-ignore
/CONTRIBUTING.md export-ignore
.scrutinizer.yml export-ignore
/docker-compose.yml export-ignore
/docker-stack.yml export-ignore
/Dockerfile export-ignore
/phpunit.xml export-ignore
/renovate.json export-ignore
/test.Dockerfile export-ignore
# merge skip file
# $ git config --global merge.ours.driver true
# # $ git merge -s ours
#
# @see https://stackoverflow.com/questions/15232000/git-ignore-files-during-merge
# @see https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes#_merge_strategies
# CHANGELOG.md merge=ours
# composer.json merge=ours
# docker-compose.yml merge=ours
# Dockerfile merge=ours