Gitflow: Merge Conflict Issue · Workflow runs · getsentry/sentry-javascript · GitHub

Actions

All workflows
Workflows
- Action: Prepare Release Action: Prepare Release
- Gitflow: Merge Conflict Issue Gitflow: Merge Conflict Issue
- Action: Clear all GHA caches Action: Clear all GHA caches
- Automation: Accept Bundlesize Increase Automation: Accept Bundlesize Increase
- Automation: Add size info to release Automation: Add size info to release
- Automation: Cleanup PR caches Automation: Cleanup PR caches
- Automation: Notify issues for release Automation: Notify issues for release
- Automation: Tag issue with package label Automation: Tag issue with package label
- Automation: Update GH Project Automation: Update GH Project
- Build Playwright Docker Image Build Playwright Docker Image
- CI: Build & Test CI: Build & Test
Management
- Caches
- Deployments

Gitflow: Merge Conflict Issue

Actions

Loading...
Loading

gitflow-merge-conflict.yml

971 workflow runs

971 workflow runs

test(nuxt): Make Nuxt 5 (nightly) E2E optional Gitflow: Merge Conflict Issue #896: Pull request #20113 opened by s1gr1d

2s sig/nuxt-5-optional

sig/nuxt-5-optional

2s

feat(deps): bump vite from 5.4.21 to 6.4.2 Gitflow: Merge Conflict Issue #895: Pull request #20111 opened by dependabot bot

1s dependabot/npm_and_yarn/vite-6.4.2

dependabot/npm_and_yarn/vite-6.4.2

1s

feat(deps): Bump @nestjs/core from 10.4.15 to 11.1.18 Gitflow: Merge Conflict Issue #894: Pull request #20109 opened by dependabot bot

Skipped dependabot/npm_and_yarn/nestjs/core-11.1.18

dependabot/npm_and_yarn/nestjs/core-11.1.18

Skipped

feat(node): Include global scope for eventLoopBlockIntegration Gitflow: Merge Conflict Issue #893: Pull request #20108 opened by timfish

1s timfish/feat/event-loop-block-scope

timfish/feat/event-loop-block-scope

1s

chore(deps-dev): Bump vite from 7.2.0 to 7.3.2 in /dev-packages/e2e-tests/test-applications/tanstackstart-react Gitflow: Merge Conflict Issue #892: Pull request #20107 opened by dependabot bot

1s dependabot/npm_and_yarn/dev-packages/e2e-tests/test-applications/tanstackstart-react/vite-7.3.2

dependabot/npm_and_yarn/dev-packages/e2e-tests/test-applications/tanstackstart-react/vite-7.3.2

1s

feat(deps): bump defu from 6.1.4 to 6.1.6 Gitflow: Merge Conflict Issue #891: Pull request #20104 opened by dependabot bot

1s dependabot/npm_and_yarn/defu-6.1.6

dependabot/npm_and_yarn/defu-6.1.6

1s

feat(deps): bump @hapi/content from 6.0.0 to 6.0.1 Gitflow: Merge Conflict Issue #889: Pull request #20102 opened by dependabot bot

1s dependabot/npm_and_yarn/hapi/content-6.0.1

dependabot/npm_and_yarn/hapi/content-6.0.1

1s

ref(core): Add registry in Vercel ai integration Gitflow: Merge Conflict Issue #888: Pull request #20098 opened by nicohrubec

1s nh/vercel-ops-registry

nh/vercel-ops-registry

1s

ref(node): use replaceExports core utility for openai/anthropic client patching Gitflow: Merge Conflict Issue #887: Pull request #20097 opened by nicohrubec

1s nh/replace-exports

nh/replace-exports

1s

ref(core): Remove unused constants from vercel-ai-attributes.ts Gitflow: Merge Conflict Issue #886: Pull request #20096 opened by nicohrubec

1s nh/remove-dead-vercel-attributes

nh/remove-dead-vercel-attributes

1s

ref(core): Merge embeddings operations constants Gitflow: Merge Conflict Issue #885: Pull request #20095 opened by nicohrubec

1s nh/merge-embeddings-ops-consts

nh/merge-embeddings-ops-consts

1s

chore(deps-dev): bump ember-cli-dependency-checker from 3.3.2 to 3.3.3 Gitflow: Merge Conflict Issue #884: Pull request #20093 opened by dependabot bot

7s dependabot/npm_and_yarn/ember-cli-dependency-checker-3.3.3

dependabot/npm_and_yarn/ember-cli-dependency-checker-3.3.3

7s

feat(deps): bump webpack-bundle-analyzer from 4.10.2 to 5.3.0 Gitflow: Merge Conflict Issue #883: Pull request #20092 opened by dependabot bot

1s dependabot/npm_and_yarn/webpack-bundle-analyzer-5.3.0

dependabot/npm_and_yarn/webpack-bundle-analyzer-5.3.0

1s

feat(deps): Bump @actions/io from 1.1.3 to 3.0.2 Gitflow: Merge Conflict Issue #882: Pull request #20090 opened by dependabot bot

1s dependabot/npm_and_yarn/actions/io-3.0.2

dependabot/npm_and_yarn/actions/io-3.0.2

1s

chore(deps-dev): bump @testing-library/dom from 7.31.2 to 10.4.1 Gitflow: Merge Conflict Issue #881: Pull request #20091 opened by dependabot bot

1s dependabot/npm_and_yarn/testing-library/dom-10.4.1

dependabot/npm_and_yarn/testing-library/dom-10.4.1

1s

fix(core): Replace regex with string check in stack parser to prevent main thread blocking Gitflow: Merge Conflict Issue #880: Pull request #20089 opened by chargome

2s cg/fix-stack-parser

cg/fix-stack-parser

2s

tests(node): Add node integration tests for Vercel ToolLoopAgent Gitflow: Merge Conflict Issue #879: Pull request #20087 opened by nicohrubec

1s nh/tool-loop-agent

nh/tool-loop-agent

1s

feat(deps): Bump lodash.template from 4.5.0 to 4.18.1 Gitflow: Merge Conflict Issue #878: Pull request #20085 opened by dependabot bot

1s dependabot/npm_and_yarn/lodash.template-4.18.1

dependabot/npm_and_yarn/lodash.template-4.18.1

1s

fix(core): set span.status to error when MCP tool returns JSON-RPC error response Gitflow: Merge Conflict Issue #877: Pull request #20082 opened by betegon

6s fix/mcp-span-status-error

fix/mcp-span-status-error

6s

ci(deps): Bump getsentry/craft/.github/workflows/changelog-preview.yml from 2.24.1 to 2.25.2 Gitflow: Merge Conflict Issue #876: Pull request #20081 opened by dependabot bot

1s dependabot/github_actions/getsentry/craft/dot-github/workflows/changelog-preview.yml-2.25.2

dependabot/github_actions/getsentry/craft/dot-github/workflows/changelog-preview.yml-2.25.2

1s

ci(deps): Bump denoland/setup-deno from 2.0.3 to 2.0.4 Gitflow: Merge Conflict Issue #875: Pull request #20080 opened by dependabot bot

Skipped dependabot/github_actions/denoland/setup-deno-2.0.4

dependabot/github_actions/denoland/setup-deno-2.0.4

Skipped

ci(deps): Bump actions/create-github-app-token from 2 to 3 Gitflow: Merge Conflict Issue #874: Pull request #20079 opened by dependabot bot

1s dependabot/github_actions/actions/create-github-app-token-3

dependabot/github_actions/actions/create-github-app-token-3

1s

ci(deps): Bump mshick/add-pr-comment from dd126dd8c253650d181ad9538d8b4fa218fc31e8 to e7516d74559b5514092f5b096ed29a629a1237c6 Gitflow: Merge Conflict Issue #873: Pull request #20078 opened by dependabot bot

1s dependabot/github_actions/mshick/add-pr-comment-e7516d74559b5514092f5b096ed29a629a1237c6

dependabot/github_actions/mshick/add-pr-comment-e7516d74559b5514092f5b096ed29a629a1237c6

1s

ci(deps): Bump dorny/paths-filter from 3.0.1 to 4.0.1 Gitflow: Merge Conflict Issue #872: Pull request #20077 opened by dependabot bot

1s dependabot/github_actions/dorny/paths-filter-4.0.1

dependabot/github_actions/dorny/paths-filter-4.0.1

1s

feat(core): Export a reusable function to add tracing headers Gitflow: Merge Conflict Issue #871: Pull request #20076 opened by JPeer264

1s jp/export-trace-headers

jp/export-trace-headers

1s