chore(git): union-merge driver for CHANGELOG to cut parallel-PR conflicts (REQ-164, #422)#423
Merged
Merged
Conversation
…icts (REQ-164, #422) Self-found while landing several one-REQ-per-PR changes in one session: every PR conflicts in CHANGELOG.md (entries at the top of `[Unreleased]`) and requirements.yaml, forcing a manual resolve each time. Add `.gitattributes` `CHANGELOG.md merge=union` — git's built-in union driver keeps both sides' added lines instead of conflicting (safe for an append-only prose log). Deliberately NOT applied to artifacts/*.yaml: union-concatenating conflicting YAML hunks can silently produce malformed YAML, worse than a conflict that forces review — the guidance there is to append REQs at EOF (as REQ-164 itself does) or use `rivet add`. REQ-164 artifact appended at end-of-file (practising the guidance). rivet validate PASS. Implements: REQ-164 Refs: REQ-007 Trace: skip
📐 Rivet artifact delta
Graphgraph LR
REQ_164["REQ-164"]:::added
classDef added fill:#d4edda,stroke:#28a745,color:#155724
classDef removed fill:#f8d7da,stroke:#dc3545,color:#721c24
classDef modified fill:#fff3cd,stroke:#ffc107,color:#856404
classDef overflow fill:#e2e3e5,stroke:#6c757d,color:#495057,stroke-dasharray: 3 3
Added
Posted by |
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
⚠️ Performance Alert ⚠️
Possible performance regression was detected for benchmark 'Rivet Criterion Benchmarks'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 1.20.
| Benchmark suite | Current: c60e0d0 | Previous: 950c605 | Ratio |
|---|---|---|---|
traceability_matrix/1000 |
60598 ns/iter (± 882) |
44712 ns/iter (± 163) |
1.36 |
query/10000 |
346818 ns/iter (± 2973) |
232623 ns/iter (± 1748) |
1.49 |
This comment was automatically generated by workflow using github-action-benchmark.
…-merge # Conflicts: # artifacts/requirements.yaml
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Implements the safe half of #422 (a friction I hit repeatedly this session — resolving CHANGELOG/requirements conflicts on #419 and #421 within the same hour).
What
.gitattributes:CHANGELOG.md merge=union— git's built-in union driver keeps both sides' added lines instead of conflicting. Ideal for an append-only prose log; worst case is an out-of-order entry, trivially fixed.Deliberately NOT done
artifacts/*.yaml merge=union— union-concatenating conflicting YAML hunks can silently produce malformed/misordered YAML, which is worse than a conflict that forces a human to look. The guidance there (per Parallel PRs serially conflict in CHANGELOG.md + artifacts/requirements.yaml (every REQ/changelog addition collides) #422) is to append REQs at EOF (which REQ-164 in this PR does) or userivet add(which already appends), never insert mid-file.No CHANGELOG entry here on purpose — it's a
.gitattributeschore, and adding one would create exactly the conflict this fixes.rivet validatePASS.Implements: REQ-164