forked from morpheus65535/bazarr
-
Notifications
You must be signed in to change notification settings - Fork 2
Expand file tree
/
Copy path.gitattributes
More file actions
30 lines (26 loc) · 813 Bytes
/
.gitattributes
File metadata and controls
30 lines (26 loc) · 813 Bytes
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
# Auto-detect text files and perform LF normalization
* text=auto
# Fork-specific files - always keep ours during merge conflicts
# These files contain customizations that should not be overwritten by upstream merges
README.md merge=ours
package_info merge=ours
bazarr/app/check_update.py merge=ours
custom_libs/subliminal_patch/providers/opensubtitles_scraper.py merge=ours
Dockerfile merge=ours
docker-compose.yml merge=ours
docker/entrypoint.sh merge=ours
.dockerignore merge=ours
.gitattributes merge=ours
docs/FORK_MAINTENANCE.md merge=ours
# GitHub workflows - keep our fork's versions
.github/workflows/* merge=ours
# Git submodule - keep our reference
.gitmodules merge=ours
opensubtitles-scraper merge=ours
# Binary files
*.png binary
*.jpg binary
*.jpeg binary
*.gif binary
*.ico binary
*.zip binary