-
Notifications
You must be signed in to change notification settings - Fork 2
Expand file tree
/
Copy path.gitattributes
More file actions
32 lines (24 loc) · 1.26 KB
/
Copy path.gitattributes
File metadata and controls
32 lines (24 loc) · 1.26 KB
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
# Merge strategy to favor Toga branch for wx/legacy GUI code and conflicting app modules
# These rules help when merging origin/dev into feature/toga-migration
# Use 'ours' merge driver for these paths (keep current branch version during merges)
# Note: Requires core driver 'merge=ours' which is built-in to Git.
# Legacy/wx-era app and GUI modules removed/replaced by Toga
src/accessiweather/app.py merge=ours
src/accessiweather/dialogs/** merge=ours
src/accessiweather/display/** merge=ours
src/accessiweather/gui/** merge=ours
# Models and services that diverge between branches
src/accessiweather/models.py merge=ours
src/accessiweather/services/** merge=ours
# Notifications diverged (sound, toast, etc.)
src/accessiweather/notifications/** merge=ours
# Any remaining legacy top-level modules we replaced in Toga
src/accessiweather/formatters.py merge=ours
src/accessiweather/location_manager.py merge=ours
# If dev deletes files we still keep, preserve ours
# Allow Git to detect text files normally so diffs are generated and tools that
# rely on textual patches (including PR automation) function correctly.
* text=auto
# AppImage launcher runs on Linux; a CRLF checkout would break its shebang.
installer/appimage/AppRun text eol=lf
installer/appimage/*.desktop text eol=lf