Commit f10c2c4
committed
git: union-merge Cargo.toml to end the example-list conflict cascade
Every topic branch that adds a [[example]] entry collides on the same region
of Cargo.toml, so each merge dirties the next chained PR. The built-in `union`
merge driver keeps both sides of an additive conflict hunk — exactly right for
this append-only list — and GitHub's merge honors it. Once this lands on master,
subsequent example-adding PRs merge with no manual conflict resolution.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01MLBnPuScZy6w9di2QEjsXM1 parent e44003e commit f10c2c4
1 file changed
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
0 commit comments