mirror of
https://github.com/fulpstation/fulpstation.git
synced 2025-12-09 16:09:15 +00:00
2106e3a1b2
It hooks into git as a merge driver and automatically runs with merges. It prints a log of what it did, and if any specific states are conflicted it indicates them and does not mark the merge as successful. The conflicting icon can then be opened in DreamMaker and the conflicting states resolved there.
7 lines
172 B
Plaintext
7 lines
172 B
Plaintext
# merger hooks, run tools/hooks/install.bat or install.sh to set up
|
|
*.dmm merge=dmm
|
|
*.dmi merge=dmi
|
|
|
|
# force changelog merging to use union
|
|
html/changelog.html merge=union
|