pythonbyexample/.gitattributes at main · adewale/pythonbyexample · GitHub

11 lines (11 loc) · 650 Bytes

# `src/asset_manifest.py` is generated by `scripts/fingerprint_assets.py`,

# `src/example_sources_data.py` by `scripts/embed_example_sources.py`, and

# `src/editorial_registry_data.py` by `scripts/embed_editorial_registry.py`.

# On merge/rebase, keep our side of the conflict — the post-merge and

# post-rewrite hooks regenerate these files deterministically afterwards.

# This works once `scripts/install-git-hooks.sh` has been run locally,

# which registers `merge.ours.driver = true` and points `core.hooksPath`

# at `.githooks/`.

src/asset_manifest.py merge=ours

src/example_sources_data.py merge=ours

src/editorial_registry_data.py merge=ours

Expand file tree