Resolve the merge-conflict markers committed in .gitignore - #8
Conversation
The 2026-08-22 merge left <<<<<<< / ======= / >>>>>>> in the file, so git read those three lines as literal patterns and neither side's rules applied: the subgraph transient-output rules and `target` were both inert. Both sides are kept. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
|
Warning Review limit reached
Next review available in: 20 minutes Limit details: You’ve used the included review currently available. You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository. How can I continue?Wait for the limit to reset, then comment An organization admin can change what happens after included review limits in Billing. How do review limits work?CodeRabbit enforces per-developer PR review limits within each organization. For paid Pro and Pro+ reviews, CodeRabbit uses a developer's included PR review attempts over the past 7 days to set the current hourly allowance. At typical activity levels, the full plan allowance applies. Higher sustained activity can lower the allowance until earlier attempts leave the 7-day window. Please refer docs for additional details. Review details⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Plus Run ID: 📒 Files selected for processing (1)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
.gitignoreon main contains unresolved merge-conflict markers, committed by the 2026-08-22 merge ("Merge main: the release cut and goldsky reporter landed beside this branch"):git has no special handling for those lines — it reads
<<<<<<< HEAD,=======and>>>>>>> origin/mainas literal filename patterns. The consequence is that neither side of the conflict is in effect: the/subgraph/*+!/subgraph/networks.jsonrules that keepgraph build's transient output (build/,generated/,node_modules/, the rewritten manifest) out of the repo are inert, and so istarget. Anyone running the subgraph deploy workflow locally, or any Rust build, gets untracked output offered up bygit statusand at risk of being committed.Both sides are kept — they were never in genuine conflict, just adjacent edits.
Found while deriving the org's deploy-repo standard from this repo and its siblings.
QA
.gitignorehas no test harness in this repo. Verified by hand instead: on main,git check-ignore -v targetandgit check-ignore -v subgraph/buildboth report no match; with this fix,targetmatches thetargetrule andsubgraph/buildmatches/subgraph/*, whilesubgraph/networks.jsonstays tracked via the negation.