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
- Auto-bump size-limit thresholds Auto-bump size-limit thresholds
- 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
Management
- Caches
- Deployments

Gitflow: Merge Conflict Issue

Actions

Loading...
Loading

gitflow-merge-conflict.yml

1,056 workflow runs

1,056 workflow runs

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

chore(oxlint): Add typeawareness into oxlintrc Gitflow: Merge Conflict Issue #870: Pull request #20075 opened by JPeer264

1s jp/oxlint-typeaware

jp/oxlint-typeaware

1s

ref(core): Unify .do* span ops to gen_ai.generate_content Gitflow: Merge Conflict Issue #869: Pull request #20074 opened by nicohrubec

2s nh/unify-vercel-span-ops

nh/unify-vercel-span-ops

2s

chore: Add external contributor to CHANGELOG.md Gitflow: Merge Conflict Issue #868: Pull request #20073 opened by javascript-sdk-gitflow Bot

1s external-contributor/patch-stephanie-anderson

external-contributor/patch-stephanie-anderson

1s

chore: Update validate-pr workflow Gitflow: Merge Conflict Issue #867: Pull request #20072 opened by stephanie-anderson

1s feat/update-validate-pr-sha

feat/update-validate-pr-sha

1s

feat(core): support registerTool/registerResource/registerPrompt in MCP integration Gitflow: Merge Conflict Issue #866: Pull request #20071 opened by betegon

1s feat/mcp-register-api-support

feat/mcp-register-api-support

1s

feat(core): support registerTool/registerResource/registerPrompt in MCP integration Gitflow: Merge Conflict Issue #865: Pull request #20070 opened by betegon

1s feat/mcp-register-api-support

feat/mcp-register-api-support

1s

feat(core): support registerTool/registerResource/registerPrompt in MCP integration Gitflow: Merge Conflict Issue #864: Pull request #20069 opened by betegon

1s feat/mcp-register-api-support

feat/mcp-register-api-support

1s

feat(node, bun): Enforce minimum collection interval in runtime metrics integrations Gitflow: Merge Conflict Issue #863: Pull request #20068 opened by chargome

1s cg/runtime-metrics-min-interval

cg/runtime-metrics-min-interval

1s

chore: Remove unused tsconfig-template folder Gitflow: Merge Conflict Issue #862: Pull request #20067 opened by mydea

1s fn/remove-ts-template-dir

fn/remove-ts-template-dir

1s

feat(deps): Bump @xmldom/xmldom from 0.8.3 to 0.8.12 Gitflow: Merge Conflict Issue #861: Pull request #20066 opened by dependabot Bot

1s dependabot/npm_and_yarn/xmldom/xmldom-0.8.12

dependabot/npm_and_yarn/xmldom/xmldom-0.8.12

1s

fix(aws-serverless): Add timeout to _endSpan forceFlush to prevent Lambda hanging Gitflow: Merge Conflict Issue #860: Pull request #20064 opened by logaretm

1s awad/js-2033-aws-can-block-handler-indefinitely

awad/js-2033-aws-can-block-handler-indefinitely

1s

feat(core, node): portable connect integration Gitflow: Merge Conflict Issue #859: Pull request #20062 opened by isaacs

1s isaacschlueter/portable-connect-integration

isaacschlueter/portable-connect-integration

1s

feat(deno): add Express integration Gitflow: Merge Conflict Issue #858: Pull request #20060 opened by isaacs

1s isaacschlueter/js-2030-deno-express-integration

isaacschlueter/js-2030-deno-express-integration

1s