Skip to content

Bump the npm_and_yarn group across 1 directory with 2 updates - #78

Open
dependabot[bot] wants to merge 1 commit into
mainfrom
dependabot/npm_and_yarn/npm_and_yarn-916d55ce75
Open

Bump the npm_and_yarn group across 1 directory with 2 updates#78
dependabot[bot] wants to merge 1 commit into
mainfrom
dependabot/npm_and_yarn/npm_and_yarn-916d55ce75

Conversation

@dependabot

@dependabot dependabot Bot commented on behalf of github Mar 3, 2026

Copy link
Copy Markdown
Contributor

Bumps the npm_and_yarn group with 2 updates in the / directory: diff and lodash.

Updates diff from 4.0.2 to 4.0.4

Changelog

Sourced from diff's changelog.

v4.0.4 - January 2026

Only change from 4.0.2 is a backport of the fix to GHSA-73rr-hh4g-fpgx.

v4.0.3 (deprecated)

Accidental release - do not use.

Commits
Maintainer changes

This version was pushed to npm by explodingcabbage, a new releaser for diff since your current version.


Updates lodash from 4.17.21 to 4.17.23

Commits

Note
Automatic rebases have been disabled on this pull request as it has been open for over 30 days.

@dependabot dependabot Bot added dependencies Pull requests that update a dependency file javascript Pull requests that update javascript code labels Mar 3, 2026
@dependabot
dependabot Bot force-pushed the dependabot/npm_and_yarn/npm_and_yarn-916d55ce75 branch from 8bdca78 to 082b1e5 Compare March 17, 2026 10:18
Bumps the npm_and_yarn group with 2 updates in the / directory: [diff](https://github.com/kpdecker/jsdiff) and [lodash](https://github.com/lodash/lodash).


Updates `diff` from 4.0.2 to 4.0.4
- [Changelog](https://github.com/kpdecker/jsdiff/blob/master/release-notes.md)
- [Commits](kpdecker/jsdiff@v4.0.2...v4.0.4)

Updates `lodash` from 4.17.21 to 4.17.23
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.21...4.17.23)

---
updated-dependencies:
- dependency-name: diff
  dependency-version: 4.0.4
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: lodash
  dependency-version: 4.17.23
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
@repowarden-app

Copy link
Copy Markdown

I couldn't rebase this branch onto main due to conflicts.

Conflict details
fatal: invalid upstream 'origin/main'

Please resolve the conflicts manually and try again.

Powered by RepoWarden

@repowarden-app

Copy link
Copy Markdown

I couldn't rebase this branch onto main due to conflicts.

Conflict details
Auto-merging pnpm-lock.yaml
CONFLICT (content): Merge conflict in pnpm-lock.yaml

Rebasing (1/1)
error: could not apply bc63136... Bump the npm_and_yarn group across 1 directory with 2 updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply bc63136... # Bump the npm_and_yarn group across 1 directory with 2 updates

Please resolve the conflicts manually and try again.

Powered by RepoWarden

11 similar comments
@repowarden-app

Copy link
Copy Markdown

I couldn't rebase this branch onto main due to conflicts.

Conflict details
Auto-merging pnpm-lock.yaml
CONFLICT (content): Merge conflict in pnpm-lock.yaml

Rebasing (1/1)
error: could not apply bc63136... Bump the npm_and_yarn group across 1 directory with 2 updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply bc63136... # Bump the npm_and_yarn group across 1 directory with 2 updates

Please resolve the conflicts manually and try again.

Powered by RepoWarden

@repowarden-app

Copy link
Copy Markdown

I couldn't rebase this branch onto main due to conflicts.

Conflict details
Auto-merging pnpm-lock.yaml
CONFLICT (content): Merge conflict in pnpm-lock.yaml

Rebasing (1/1)
error: could not apply bc63136... Bump the npm_and_yarn group across 1 directory with 2 updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply bc63136... # Bump the npm_and_yarn group across 1 directory with 2 updates

Please resolve the conflicts manually and try again.

Powered by RepoWarden

@repowarden-app

Copy link
Copy Markdown

I couldn't rebase this branch onto main due to conflicts.

Conflict details
Auto-merging pnpm-lock.yaml
CONFLICT (content): Merge conflict in pnpm-lock.yaml

Rebasing (1/1)
error: could not apply bc63136... Bump the npm_and_yarn group across 1 directory with 2 updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply bc63136... # Bump the npm_and_yarn group across 1 directory with 2 updates

Please resolve the conflicts manually and try again.

Powered by RepoWarden

@repowarden-app

repowarden-app Bot commented Aug 1, 2026

Copy link
Copy Markdown

I couldn't rebase this branch onto main due to conflicts.

Conflict details
Auto-merging pnpm-lock.yaml
CONFLICT (content): Merge conflict in pnpm-lock.yaml

Rebasing (1/1)
error: could not apply bc63136... Bump the npm_and_yarn group across 1 directory with 2 updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply bc63136... # Bump the npm_and_yarn group across 1 directory with 2 updates

Please resolve the conflicts manually and try again.

Powered by RepoWarden

@repowarden-app

repowarden-app Bot commented Aug 2, 2026

Copy link
Copy Markdown

I couldn't rebase this branch onto main due to conflicts.

Conflict details
Auto-merging pnpm-lock.yaml
CONFLICT (content): Merge conflict in pnpm-lock.yaml

Rebasing (1/1)
error: could not apply bc63136... Bump the npm_and_yarn group across 1 directory with 2 updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply bc63136... # Bump the npm_and_yarn group across 1 directory with 2 updates

Please resolve the conflicts manually and try again.

Powered by RepoWarden

@repowarden-app

repowarden-app Bot commented Aug 3, 2026

Copy link
Copy Markdown

I couldn't rebase this branch onto main due to conflicts.

Conflict details
Auto-merging pnpm-lock.yaml
CONFLICT (content): Merge conflict in pnpm-lock.yaml

Rebasing (1/1)
error: could not apply bc63136... Bump the npm_and_yarn group across 1 directory with 2 updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply bc63136... # Bump the npm_and_yarn group across 1 directory with 2 updates

Please resolve the conflicts manually and try again.

Powered by RepoWarden

@repowarden-app

repowarden-app Bot commented Aug 4, 2026

Copy link
Copy Markdown

I couldn't rebase this branch onto main due to conflicts.

Conflict details
Auto-merging pnpm-lock.yaml
CONFLICT (content): Merge conflict in pnpm-lock.yaml

Rebasing (1/1)
error: could not apply bc63136... Bump the npm_and_yarn group across 1 directory with 2 updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply bc63136... # Bump the npm_and_yarn group across 1 directory with 2 updates

Please resolve the conflicts manually and try again.

Powered by RepoWarden

@repowarden-app

repowarden-app Bot commented Aug 5, 2026

Copy link
Copy Markdown

I couldn't rebase this branch onto main due to conflicts.

Conflict details
Auto-merging pnpm-lock.yaml
CONFLICT (content): Merge conflict in pnpm-lock.yaml

Rebasing (1/1)
error: could not apply bc63136... Bump the npm_and_yarn group across 1 directory with 2 updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply bc63136... # Bump the npm_and_yarn group across 1 directory with 2 updates

Please resolve the conflicts manually and try again.

Powered by RepoWarden

@repowarden-app

repowarden-app Bot commented Aug 6, 2026

Copy link
Copy Markdown

I couldn't rebase this branch onto main due to conflicts.

Conflict details
Auto-merging pnpm-lock.yaml
CONFLICT (content): Merge conflict in pnpm-lock.yaml

Rebasing (1/1)
error: could not apply bc63136... Bump the npm_and_yarn group across 1 directory with 2 updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply bc63136... # Bump the npm_and_yarn group across 1 directory with 2 updates

Please resolve the conflicts manually and try again.

Powered by RepoWarden

@repowarden-app

repowarden-app Bot commented Aug 7, 2026

Copy link
Copy Markdown

I couldn't rebase this branch onto main due to conflicts.

Conflict details
Auto-merging pnpm-lock.yaml
CONFLICT (content): Merge conflict in pnpm-lock.yaml

Rebasing (1/1)
error: could not apply bc63136... Bump the npm_and_yarn group across 1 directory with 2 updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply bc63136... # Bump the npm_and_yarn group across 1 directory with 2 updates

Please resolve the conflicts manually and try again.

Powered by RepoWarden

@repowarden-app

repowarden-app Bot commented Aug 8, 2026

Copy link
Copy Markdown

I couldn't rebase this branch onto main due to conflicts.

Conflict details
Auto-merging pnpm-lock.yaml
CONFLICT (content): Merge conflict in pnpm-lock.yaml

Rebasing (1/1)
error: could not apply bc63136... Bump the npm_and_yarn group across 1 directory with 2 updates
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply bc63136... # Bump the npm_and_yarn group across 1 directory with 2 updates

Please resolve the conflicts manually and try again.

Powered by RepoWarden

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file javascript Pull requests that update javascript code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants