Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(core): properly diff json from the merge-base #15476

Merged
merged 1 commit into from
Mar 6, 2023

Conversation

FrozenPandaz
Copy link
Collaborator

Current Behavior

When --base is passed and there are json changes on both the base and the head, the diff will occur between the base and the head. This includes later changes from the base which are usually ignored by finding a common ancestor commit.

Expected Behavior

When --base is passed and there are json changes on both the base and the head, the diff will occur between the merge-base and the head. This will not include later changes from the base.

Related Issue(s)

Fixes #

@vercel
Copy link

vercel bot commented Mar 6, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated
nx-dev ✅ Ready (Inspect) Visit Preview 💬 Add your feedback Mar 6, 2023 at 4:16PM (UTC)

@FrozenPandaz FrozenPandaz merged commit ffac350 into nrwl:master Mar 6, 2023
@FrozenPandaz FrozenPandaz deleted the fix-affected-json branch March 6, 2023 18:54
FrozenPandaz added a commit that referenced this pull request Mar 8, 2023
@github-actions
Copy link

This pull request has already been merged/closed. If you experience issues related to these changes, please open a new issue referencing this pull request.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 12, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants