Compare commits
1
Commits
next
...
ab2e664e5c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ab2e664e5c |
@@ -0,0 +1,2 @@
|
|||||||
|
# Every PR adds an entry at the top of Completed Steps; union keeps both sides.
|
||||||
|
TODO.md merge=union
|
||||||
@@ -21,6 +21,12 @@ fmt-check, and commit.
|
|||||||
|
|
||||||
# Completed Steps
|
# Completed Steps
|
||||||
|
|
||||||
|
- 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 with both entries kept instead of conflicting. The cost
|
||||||
|
is that a real conflict elsewhere in `TODO.md` is no longer reported: both
|
||||||
|
versions of the line are kept. It applies to this repository only; nothing
|
||||||
|
canonical changed.
|
||||||
- 2026-10-04: The note under the canonical Go `Dockerfile` example in
|
- 2026-10-04: The note under the canonical Go `Dockerfile` example in
|
||||||
`REPO_POLICIES.md` now installs lint-phase system libraries with `apt-get`
|
`REPO_POLICIES.md` now installs lint-phase system libraries with `apt-get`
|
||||||
under their Debian package names (issue 83). The `golangci/golangci-lint`
|
under their Debian package names (issue 83). The `golangci/golangci-lint`
|
||||||
|
|||||||
Reference in New Issue
Block a user