Skip to content

Resolve the merge-conflict markers committed in .gitignore - #8

Merged
thedavidmeister merged 1 commit into
mainfrom
2026-08-23-gitignore-conflict-markers
Aug 23, 2026
Merged

Resolve the merge-conflict markers committed in .gitignore#8
thedavidmeister merged 1 commit into
mainfrom
2026-08-23-gitignore-conflict-markers

Conversation

@thedavidmeister

Copy link
Copy Markdown
Contributor

.gitignore on 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"):

<<<<<<< HEAD
… subgraph rules …
=======
target
>>>>>>> origin/main

git has no special handling for those lines — it reads <<<<<<< HEAD, ======= and >>>>>>> origin/main as literal filename patterns. The consequence is that neither side of the conflict is in effect: the /subgraph/* + !/subgraph/networks.json rules that keep graph build's transient output (build/, generated/, node_modules/, the rewritten manifest) out of the repo are inert, and so is target. Anyone running the subgraph deploy workflow locally, or any Rust build, gets untracked output offered up by git status and 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

  • Discriminating tests: n/a — .gitignore has no test harness in this repo. Verified by hand instead: on main, git check-ignore -v target and git check-ignore -v subgraph/build both report no match; with this fix, target matches the target rule and subgraph/build matches /subgraph/*, while subgraph/networks.json stays tracked via the negation.
  • Mutations applied: n/a — no executable code in the diff.
  • Oracle: git's documented gitignore semantics (no conflict-marker handling; every non-comment line is a pattern), plus the pre-merge content of both parents, which shows the two rule sets were independent additions rather than competing edits.
  • Category check: no linked issue; the ask was to bring this family of repos to the current standard, and this is one of the defects that audit surfaced. Covers the conflict markers only; the other findings (stale docs in sibling repos, missing currency checks) are filed separately.

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>
@coderabbitai

coderabbitai Bot commented Aug 23, 2026

Copy link
Copy Markdown

Warning

Review limit reached

@thedavidmeister, you've reached your PR review limit, so we couldn't start this review.

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 @coderabbitai review or push new commits to the PR.

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 configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 12b17c5d-8437-4759-8704-80648c219376

📥 Commits

Reviewing files that changed from the base of the PR and between c20f848 and e3f47cd.

📒 Files selected for processing (1)
  • .gitignore

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@thedavidmeister
thedavidmeister merged commit 03c05df into main Aug 23, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant