Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3746261144 | ||
|
|
13125ac6f5 |
@@ -0,0 +1,4 @@
|
|||||||
|
# Every PR adds an entry at the top of TODO.md's Completed Steps; union keeps
|
||||||
|
# both sides instead of conflicting. Git never reports a conflict here: read
|
||||||
|
# the merged entries after every merge or rebase.
|
||||||
|
TODO.md merge=union
|
||||||
@@ -28,6 +28,14 @@ fmt-check, and commit.
|
|||||||
`script/bootstrap`, as this repo's own `Dockerfile` does for its yarn
|
`script/bootstrap`, as this repo's own `Dockerfile` does for its yarn
|
||||||
packages. The development environment stage, the final stage of a non-server
|
packages. The development environment stage, the final stage of a non-server
|
||||||
repo, runs `script/bootstrap`. The new repo checklist says the same.
|
repo, runs `script/bootstrap`. The new repo checklist says the same.
|
||||||
|
- 2026-10-04: Added a root `.gitattributes` that merges `TODO.md` with git's
|
||||||
|
union merge (issue 98), so two branches that each add an entry at the top of
|
||||||
|
Completed Steps merge without a conflict. Git now never reports a conflict in
|
||||||
|
`TODO.md`: a real conflict elsewhere keeps both versions of the line, and when
|
||||||
|
two new entries share an identical line, one is inserted into the middle of
|
||||||
|
the other, which a rebase can do to an entry already on `next`. Read the
|
||||||
|
merged entries after every merge or rebase. This applies to this repository
|
||||||
|
only; no canonical file changed.
|
||||||
- 2026-10-04: The canonical `.dockerignore` now also keeps out the git `config`
|
- 2026-10-04: The canonical `.dockerignore` now also keeps out the git `config`
|
||||||
of a submodule that keeps its own `.git` directory, which still reached the
|
of a submodule that keeps its own `.git` directory, which still reached the
|
||||||
image (issue 88): both git patterns now carry the `**/` prefix. A submodule
|
image (issue 88): both git patterns now carry the `**/` prefix. A submodule
|
||||||
|
|||||||
Reference in New Issue
Block a user