Skip to content

chore: resolve merge conflict by pinning bifrost/plugins/mocker to v1.5.13 - #3914

Merged
akshaydeo merged 1 commit into
devfrom
05-31-fix_go_mod_for_transports
May 31, 2026
Merged

chore: resolve merge conflict by pinning bifrost/plugins/mocker to v1.5.13#3914
akshaydeo merged 1 commit into
devfrom
05-31-fix_go_mod_for_transports

Conversation

@BearTS

@BearTS BearTS commented May 30, 2026

Copy link
Copy Markdown
Contributor

Summary

Resolves a merge conflict by pinning github.com/maximhq/bifrost/plugins/mocker to version v1.5.13, reverting an unintended bump to v1.5.15 that was introduced during the merge.

Changes

  • Downgraded github.com/maximhq/bifrost/plugins/mocker from v1.5.15 back to v1.5.13 in both go.mod and go.sum
  • Removed the leftover merge conflict markers that were present in go.mod

Type of change

  • Bug fix
  • Feature
  • Refactor
  • Documentation
  • Chore/CI

Affected areas

  • Core (Go)
  • Transports (HTTP)
  • Providers/Integrations
  • Plugins
  • UI (React)
  • Docs

How to test

cd transports
go mod tidy
go build ./...
go test ./...

Verify that go.mod no longer contains conflict markers and that github.com/maximhq/bifrost/plugins/mocker is pinned at v1.5.13.

Screenshots/Recordings

N/A

Breaking changes

  • Yes
  • No

Related issues

Related to #3900

Security considerations

No security implications.

Checklist

  • I read docs/contributing/README.md and followed the guidelines
  • I added/updated tests where appropriate
  • I updated documentation where needed
  • I verified builds succeed (Go and UI)
  • I verified the CI pipeline passes locally if applicable

Summary by CodeRabbit

  • Chores
    • Updated internal dependency versions for maintenance.

Review Change Stack

@coderabbitai

coderabbitai Bot commented May 30, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: c12ee90e-8602-41e2-b4a0-230862241995

📥 Commits

Reviewing files that changed from the base of the PR and between 584270a and ab1db97.

⛔ Files ignored due to path filters (1)
  • transports/go.sum is excluded by !**/*.sum
📒 Files selected for processing (1)
  • transports/go.mod
💤 Files with no reviewable changes (1)
  • transports/go.mod

📝 Walkthrough

Walkthrough

The transports module dependency github.com/maximhq/bifrost/plugins/mocker is downgraded from v1.5.15 to v1.5.13 in transports/go.mod. This is a single version constraint update affecting an indirect module dependency.

Changes

Mocker Plugin Dependency Downgrade

Layer / File(s) Summary
Mocker plugin version downgrade
transports/go.mod
The indirect module github.com/maximhq/bifrost/plugins/mocker dependency is downgraded from v1.5.15 to v1.5.13.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

Suggested reviewers

  • danpiths

Poem

🐰 A version slip backward, precise and clean,
From fifteen-five to thirteen—what's between?
One line, one change, dependency adjusted,
The mocker's now older, but stable and trusted!

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title accurately summarizes the main change: resolving a merge conflict by pinning a dependency version.
Description check ✅ Passed The description follows the template structure with all major sections completed: Summary, Changes, Type of change, Affected areas, How to test, Breaking changes, Related issues, and Security considerations.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch 05-31-fix_go_mod_for_transports

Comment @coderabbitai help to get the list of available commands and usage tips.

BearTS commented May 30, 2026

Copy link
Copy Markdown
Contributor Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

@BearTS BearTS changed the title fix: go mod for transports chore: resolve merge conflict by pinning bifrost/plugins/mocker to v1.5.13 May 30, 2026
@BearTS
BearTS marked this pull request as ready for review May 30, 2026 20:31
@greptile-apps

greptile-apps Bot commented May 30, 2026

Copy link
Copy Markdown
Contributor

Confidence Score: 5/5

Safe to merge — the only change is removing leftover conflict markers and restoring the intended mocker version pin.

Both modified files are purely dependency manifest changes: conflict markers are removed and the mocker module is restored to the version that was present on HEAD before the merge. The go.sum hashes are updated consistently. No Go source files are touched, and the mocker module remains an indirect dependency, so no runtime behavior changes.

No files require special attention.

Important Files Changed

Filename Overview
transports/go.mod Removes leftover Git conflict markers and pins github.com/maximhq/bifrost/plugins/mocker to v1.5.13, reverting the accidental bump to v1.5.15 introduced during the merge.
transports/go.sum Replaces the mocker v1.5.15 hash entries with the correct v1.5.13 hashes to stay consistent with the pinned version in go.mod.

Reviews (1): Last reviewed commit: "fix: go mod for transports" | Re-trigger Greptile

akshaydeo commented May 31, 2026

Copy link
Copy Markdown
Contributor

Merge activity

  • May 31, 4:55 AM UTC: A user started a stack merge that includes this pull request via Graphite.
  • May 31, 4:55 AM UTC: @akshaydeo merged this pull request with Graphite.

@akshaydeo
akshaydeo merged commit f5f88c9 into dev May 31, 2026
14 of 15 checks passed
@akshaydeo
akshaydeo deleted the 05-31-fix_go_mod_for_transports branch May 31, 2026 04:55
akshaydeo pushed a commit that referenced this pull request May 31, 2026
…v1.5.13 (#3914)

## Summary

Resolves a merge conflict by pinning `github.com/maximhq/bifrost/plugins/mocker` to version `v1.5.13`, reverting an unintended bump to `v1.5.15` that was introduced during the merge.

## Changes

- Downgraded `github.com/maximhq/bifrost/plugins/mocker` from `v1.5.15` back to `v1.5.13` in both `go.mod` and `go.sum`
- Removed the leftover merge conflict markers that were present in `go.mod`

## Type of change

- [x] Bug fix
- [ ] Feature
- [ ] Refactor
- [ ] Documentation
- [ ] Chore/CI

## Affected areas

- [ ] Core (Go)
- [x] Transports (HTTP)
- [ ] Providers/Integrations
- [x] Plugins
- [ ] UI (React)
- [ ] Docs

## How to test

```sh
cd transports
go mod tidy
go build ./...
go test ./...
```

Verify that `go.mod` no longer contains conflict markers and that `github.com/maximhq/bifrost/plugins/mocker` is pinned at `v1.5.13`.

## Screenshots/Recordings

N/A

## Breaking changes

- [ ] Yes
- [x] No

## Related issues

Related to #3900

## Security considerations

No security implications.

## Checklist

- [ ] I read `docs/contributing/README.md` and followed the guidelines
- [ ] I added/updated tests where appropriate
- [ ] I updated documentation where needed
- [ ] I verified builds succeed (Go and UI)
- [ ] I verified the CI pipeline passes locally if applicable

<!-- This is an auto-generated comment: release notes by coderabbit.ai -->

## Summary by CodeRabbit

* **Chores**
  * Updated internal dependency versions for maintenance.

<!-- review_stack_entry_start -->

[![Review Change Stack](https://storage.googleapis.com/coderabbit_public_assets/review-stack-in-coderabbit-ui.svg)](https://app.coderabbit.ai/change-stack/maximhq/bifrost/pull/3914?utm_source=github_walkthrough&utm_medium=github&utm_campaign=change_stack)

<!-- review_stack_entry_end -->

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
akshaydeo pushed a commit that referenced this pull request May 31, 2026
…v1.5.13 (#3914)

Resolves a merge conflict by pinning `github.com/maximhq/bifrost/plugins/mocker` to version `v1.5.13`, reverting an unintended bump to `v1.5.15` that was introduced during the merge.

- Downgraded `github.com/maximhq/bifrost/plugins/mocker` from `v1.5.15` back to `v1.5.13` in both `go.mod` and `go.sum`
- Removed the leftover merge conflict markers that were present in `go.mod`

- [x] Bug fix
- [ ] Feature
- [ ] Refactor
- [ ] Documentation
- [ ] Chore/CI

- [ ] Core (Go)
- [x] Transports (HTTP)
- [ ] Providers/Integrations
- [x] Plugins
- [ ] UI (React)
- [ ] Docs

```sh
cd transports
go mod tidy
go build ./...
go test ./...
```

Verify that `go.mod` no longer contains conflict markers and that `github.com/maximhq/bifrost/plugins/mocker` is pinned at `v1.5.13`.

N/A

- [ ] Yes
- [x] No

Related to #3900

No security implications.

- [ ] I read `docs/contributing/README.md` and followed the guidelines
- [ ] I added/updated tests where appropriate
- [ ] I updated documentation where needed
- [ ] I verified builds succeed (Go and UI)
- [ ] I verified the CI pipeline passes locally if applicable

<!-- This is an auto-generated comment: release notes by coderabbit.ai -->

* **Chores**
  * Updated internal dependency versions for maintenance.

<!-- review_stack_entry_start -->

[![Review Change Stack](https://storage.googleapis.com/coderabbit_public_assets/review-stack-in-coderabbit-ui.svg)](https://app.coderabbit.ai/change-stack/maximhq/bifrost/pull/3914?utm_source=github_walkthrough&utm_medium=github&utm_campaign=change_stack)

<!-- review_stack_entry_end -->

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
akshaydeo pushed a commit that referenced this pull request May 31, 2026
…v1.5.13 (#3914)

Resolves a merge conflict by pinning `github.com/maximhq/bifrost/plugins/mocker` to version `v1.5.13`, reverting an unintended bump to `v1.5.15` that was introduced during the merge.

- Downgraded `github.com/maximhq/bifrost/plugins/mocker` from `v1.5.15` back to `v1.5.13` in both `go.mod` and `go.sum`
- Removed the leftover merge conflict markers that were present in `go.mod`

- [x] Bug fix
- [ ] Feature
- [ ] Refactor
- [ ] Documentation
- [ ] Chore/CI

- [ ] Core (Go)
- [x] Transports (HTTP)
- [ ] Providers/Integrations
- [x] Plugins
- [ ] UI (React)
- [ ] Docs

```sh
cd transports
go mod tidy
go build ./...
go test ./...
```

Verify that `go.mod` no longer contains conflict markers and that `github.com/maximhq/bifrost/plugins/mocker` is pinned at `v1.5.13`.

N/A

- [ ] Yes
- [x] No

Related to #3900

No security implications.

- [ ] I read `docs/contributing/README.md` and followed the guidelines
- [ ] I added/updated tests where appropriate
- [ ] I updated documentation where needed
- [ ] I verified builds succeed (Go and UI)
- [ ] I verified the CI pipeline passes locally if applicable

<!-- This is an auto-generated comment: release notes by coderabbit.ai -->

* **Chores**
  * Updated internal dependency versions for maintenance.

<!-- review_stack_entry_start -->

[![Review Change Stack](https://storage.googleapis.com/coderabbit_public_assets/review-stack-in-coderabbit-ui.svg)](https://app.coderabbit.ai/change-stack/maximhq/bifrost/pull/3914?utm_source=github_walkthrough&utm_medium=github&utm_campaign=change_stack)

<!-- review_stack_entry_end -->

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
akshaydeo pushed a commit that referenced this pull request May 31, 2026
…v1.5.13 (#3914)

Resolves a merge conflict by pinning `github.com/maximhq/bifrost/plugins/mocker` to version `v1.5.13`, reverting an unintended bump to `v1.5.15` that was introduced during the merge.

- Downgraded `github.com/maximhq/bifrost/plugins/mocker` from `v1.5.15` back to `v1.5.13` in both `go.mod` and `go.sum`
- Removed the leftover merge conflict markers that were present in `go.mod`

- [x] Bug fix
- [ ] Feature
- [ ] Refactor
- [ ] Documentation
- [ ] Chore/CI

- [ ] Core (Go)
- [x] Transports (HTTP)
- [ ] Providers/Integrations
- [x] Plugins
- [ ] UI (React)
- [ ] Docs

```sh
cd transports
go mod tidy
go build ./...
go test ./...
```

Verify that `go.mod` no longer contains conflict markers and that `github.com/maximhq/bifrost/plugins/mocker` is pinned at `v1.5.13`.

N/A

- [ ] Yes
- [x] No

Related to #3900

No security implications.

- [ ] I read `docs/contributing/README.md` and followed the guidelines
- [ ] I added/updated tests where appropriate
- [ ] I updated documentation where needed
- [ ] I verified builds succeed (Go and UI)
- [ ] I verified the CI pipeline passes locally if applicable

<!-- This is an auto-generated comment: release notes by coderabbit.ai -->

* **Chores**
  * Updated internal dependency versions for maintenance.

<!-- review_stack_entry_start -->

[![Review Change Stack](https://storage.googleapis.com/coderabbit_public_assets/review-stack-in-coderabbit-ui.svg)](https://app.coderabbit.ai/change-stack/maximhq/bifrost/pull/3914?utm_source=github_walkthrough&utm_medium=github&utm_campaign=change_stack)

<!-- review_stack_entry_end -->

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
Purvi09 pushed a commit to Purvi09/bifrost that referenced this pull request May 31, 2026
…v1.5.13 (maximhq#3914)

## Summary

Resolves a merge conflict by pinning `github.com/maximhq/bifrost/plugins/mocker` to version `v1.5.13`, reverting an unintended bump to `v1.5.15` that was introduced during the merge.

## Changes

- Downgraded `github.com/maximhq/bifrost/plugins/mocker` from `v1.5.15` back to `v1.5.13` in both `go.mod` and `go.sum`
- Removed the leftover merge conflict markers that were present in `go.mod`

## Type of change

- [x] Bug fix
- [ ] Feature
- [ ] Refactor
- [ ] Documentation
- [ ] Chore/CI

## Affected areas

- [ ] Core (Go)
- [x] Transports (HTTP)
- [ ] Providers/Integrations
- [x] Plugins
- [ ] UI (React)
- [ ] Docs

## How to test

```sh
cd transports
go mod tidy
go build ./...
go test ./...
```

Verify that `go.mod` no longer contains conflict markers and that `github.com/maximhq/bifrost/plugins/mocker` is pinned at `v1.5.13`.

## Screenshots/Recordings

N/A

## Breaking changes

- [ ] Yes
- [x] No

## Related issues

Related to maximhq#3900

## Security considerations

No security implications.

## Checklist

- [ ] I read `docs/contributing/README.md` and followed the guidelines
- [ ] I added/updated tests where appropriate
- [ ] I updated documentation where needed
- [ ] I verified builds succeed (Go and UI)
- [ ] I verified the CI pipeline passes locally if applicable

<!-- This is an auto-generated comment: release notes by coderabbit.ai -->

## Summary by CodeRabbit

* **Chores**
  * Updated internal dependency versions for maintenance.

<!-- review_stack_entry_start -->

[![Review Change Stack](https://storage.googleapis.com/coderabbit_public_assets/review-stack-in-coderabbit-ui.svg)](https://app.coderabbit.ai/change-stack/maximhq/bifrost/pull/3914?utm_source=github_walkthrough&utm_medium=github&utm_campaign=change_stack)

<!-- review_stack_entry_end -->

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
Purvi09 pushed a commit to Purvi09/bifrost that referenced this pull request Jun 2, 2026
…v1.5.13 (maximhq#3914)

## Summary

Resolves a merge conflict by pinning `github.com/maximhq/bifrost/plugins/mocker` to version `v1.5.13`, reverting an unintended bump to `v1.5.15` that was introduced during the merge.

## Changes

- Downgraded `github.com/maximhq/bifrost/plugins/mocker` from `v1.5.15` back to `v1.5.13` in both `go.mod` and `go.sum`
- Removed the leftover merge conflict markers that were present in `go.mod`

## Type of change

- [x] Bug fix
- [ ] Feature
- [ ] Refactor
- [ ] Documentation
- [ ] Chore/CI

## Affected areas

- [ ] Core (Go)
- [x] Transports (HTTP)
- [ ] Providers/Integrations
- [x] Plugins
- [ ] UI (React)
- [ ] Docs

## How to test

```sh
cd transports
go mod tidy
go build ./...
go test ./...
```

Verify that `go.mod` no longer contains conflict markers and that `github.com/maximhq/bifrost/plugins/mocker` is pinned at `v1.5.13`.

## Screenshots/Recordings

N/A

## Breaking changes

- [ ] Yes
- [x] No

## Related issues

Related to maximhq#3900

## Security considerations

No security implications.

## Checklist

- [ ] I read `docs/contributing/README.md` and followed the guidelines
- [ ] I added/updated tests where appropriate
- [ ] I updated documentation where needed
- [ ] I verified builds succeed (Go and UI)
- [ ] I verified the CI pipeline passes locally if applicable

<!-- This is an auto-generated comment: release notes by coderabbit.ai -->

## Summary by CodeRabbit

* **Chores**
  * Updated internal dependency versions for maintenance.

<!-- review_stack_entry_start -->

[![Review Change Stack](https://storage.googleapis.com/coderabbit_public_assets/review-stack-in-coderabbit-ui.svg)](https://app.coderabbit.ai/change-stack/maximhq/bifrost/pull/3914?utm_source=github_walkthrough&utm_medium=github&utm_campaign=change_stack)

<!-- review_stack_entry_end -->

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants