Skip to content

feat(diff): compare git refs as code graphs, with sweep, cherry-pick … - #3267

Open
M-Abdur-Rafey wants to merge 1 commit into
colbymchenry:mainfrom
M-Abdur-Rafey:feat/branch-aware-diff
Open

M-Abdur-Rafey wants to merge 1 commit into
colbymchenry:mainfrom
M-Abdur-Rafey:feat/branch-aware-diff

Conversation

@M-Abdur-Rafey

Copy link
Copy Markdown

…and rebase checks

codegraph diff <refA> <refB> builds the graph of each ref without checking it out and finds semantic merge conflicts git cannot see, such as one branch renaming a function while the other adds a call to it.

  • --sweep ranks every local branch by merge risk
  • --cherry-pick --onto reports dependencies the target lacks and the earlier commits that supply them
  • --rebase --onto replays the commits against the new base and names the first one that breaks

Symbols are matched on file, kind and qualified name because node ids hash the start line. Ref graphs are indexed from a git export and cached by sha.

…and rebase checks

`codegraph diff <refA> <refB>` builds the graph of each ref without checking
it out and finds semantic merge conflicts git cannot see, such as one branch
renaming a function while the other adds a call to it.

- --sweep <target> ranks every local branch by merge risk
- --cherry-pick <commit> --onto <ref> reports dependencies the target lacks
  and the earlier commits that supply them
- --rebase <branch> --onto <ref> replays the commits against the new base
  and names the first one that breaks

Symbols are matched on file, kind and qualified name because node ids hash
the start line. Ref graphs are indexed from a git export and cached by sha.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

This branch has not been deployed

No deployments
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