Skip to content

feat(scripts): add diff:flat script#25352

Merged
queengooborg merged 3 commits intomainfrom
flat-diff
Jul 23, 2025
Merged

feat(scripts): add diff:flat script#25352
queengooborg merged 3 commits intomainfrom
flat-diff

Conversation

@caugner
Copy link
Copy Markdown
Contributor

@caugner caugner commented Dec 9, 2024 •
edited
Loading

Summary

Adds a new script to show changes in a way that doesn't omit any changes, while keeping the diff small.

(This works especially well if multiple features are set [from the same version] to the same version.)

Test results and supporting details

I have been sharing screenshots in PRs.

Usage:

npm run diff:flat [<pr-number>]
npm run diff:flat <head-ref> [<base-ref>]

Commit before squash: 31d91fb

Related issues

@github-actions github-actions Bot added infra Infrastructure issues (npm, GitHub Actions, releases) of this project dependencies Pull requests that update a dependency package or file. scripts Issues or pull requests regarding the scripts in scripts/. size:xl [PR only] >1000 LoC changed labels Dec 9, 2024
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Dec 9, 2024 •
edited by caugner
Loading

You can review the changes grouped, ungrouped, and with mirroring applied.

@github-actions github-actions Bot added the merge conflicts 🚧 This PR needs to merge latest "main" branch to resolve a merge conflict or other issue. label Dec 9, 2024
@github-actions github-actions Bot removed the merge conflicts 🚧 This PR needs to merge latest "main" branch to resolve a merge conflict or other issue. label Jan 13, 2025
@github-actions github-actions Bot added the merge conflicts 🚧 This PR needs to merge latest "main" branch to resolve a merge conflict or other issue. label Jan 23, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jan 23, 2025

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions github-actions Bot added merge conflicts 🚧 This PR needs to merge latest "main" branch to resolve a merge conflict or other issue. and removed merge conflicts 🚧 This PR needs to merge latest "main" branch to resolve a merge conflict or other issue. labels Mar 18, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Mar 19, 2025

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions github-actions Bot added size:l [PR only] 101-1000 LoC changed and removed merge conflicts 🚧 This PR needs to merge latest "main" branch to resolve a merge conflict or other issue. size:xl [PR only] >1000 LoC changed labels Mar 28, 2025
@caugner caugner mentioned this pull request Apr 9, 2025
Merged
@github-actions github-actions Bot added the merge conflicts 🚧 This PR needs to merge latest "main" branch to resolve a merge conflict or other issue. label Apr 9, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 9, 2025

This pull request has merge conflicts that must be resolved before it can be merged.

@caugner caugner force-pushed the flat-diff branch 3 times, most recently from 18ff480 to e9d478d Compare May 15, 2025 17:16
@github-actions github-actions Bot removed the merge conflicts 🚧 This PR needs to merge latest "main" branch to resolve a merge conflict or other issue. label May 23, 2025
@caugner caugner mentioned this pull request May 23, 2025
Merged
@github-actions github-actions Bot added the merge conflicts 🚧 This PR needs to merge latest "main" branch to resolve a merge conflict or other issue. label May 30, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 30, 2025

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions github-actions Bot removed the merge conflicts 🚧 This PR needs to merge latest "main" branch to resolve a merge conflict or other issue. label May 30, 2025
@github-actions github-actions Bot added the merge conflicts 🚧 This PR needs to merge latest "main" branch to resolve a merge conflict or other issue. label Jun 13, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jun 13, 2025

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions github-actions Bot added the data:svg Compat data for SVG features. https://developer.mozilla.org/docs/Web/SVG label Jun 19, 2025
@github-actions github-actions Bot removed the merge conflicts 🚧 This PR needs to merge latest "main" branch to resolve a merge conflict or other issue. label Jun 27, 2025
@github-actions github-actions Bot removed the data:svg Compat data for SVG features. https://developer.mozilla.org/docs/Web/SVG label Jul 8, 2025
@caugner caugner force-pushed the flat-diff branch 2 times, most recently from 575e855 to c25ca78 Compare July 17, 2025 17:25
@caugner caugner requested a review from queengooborg July 17, 2025 17:28
@caugner caugner marked this pull request as ready for review July 17, 2025 17:28
@caugner
Copy link
Copy Markdown
Contributor Author

caugner commented Jul 17, 2025

@queengooborg Could you please take a look at this script in the next weeks? It would be great to finally get this in main eventually.

PS: I don't really understand why the companion workflow is failing on this branch: It runs git merge-base A B where A is the current main commit, and B is the curent flat-diff commit, and for some reason that command fails without any output (no stdout/stderr) and exit code 1.

@queengooborg queengooborg merged commit 35812e3 into main Jul 23, 2025
12 of 13 checks passed
@queengooborg queengooborg deleted the flat-diff branch July 23, 2025 03:01
@caugner caugner mentioned this pull request Aug 13, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@queengooborg queengooborg queengooborg approved these changes

Assignees

No one assigned

Labels

dependencies Pull requests that update a dependency package or file. infra Infrastructure issues (npm, GitHub Actions, releases) of this project scripts Issues or pull requests regarding the scripts in scripts/. size:l [PR only] 101-1000 LoC changed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@caugner @queengooborg