Skip to content

Upstream v0.2.1 merge conflicts #127

Closed

Description

@github-actions

Upstream v0.2.1 requires manual conflict resolution

The hourly sync stopped without changing main.

Conflicted paths

  • backend/ent/mutation.go
  • backend/ent/runtime/runtime.go
  • backend/internal/handler/admin/account_handler.go
  • backend/internal/handler/dto/types.go
  • backend/internal/handler/openai_chat_completions.go
  • backend/internal/handler/openai_codex_models_handler_test.go
  • backend/internal/handler/openai_embeddings.go
  • backend/internal/handler/openai_gateway_handler.go
  • backend/internal/handler/openai_gateway_handler_test.go
  • backend/internal/handler/stream_error_event.go
  • backend/internal/service/admin_account.go
  • backend/internal/service/admin_group.go
  • backend/internal/service/api_key_auth_cache_impl.go
  • backend/internal/service/api_key_auth_cache_openai_fast_test.go
  • backend/internal/service/api_key_auth_cache_profit_test.go
  • backend/internal/service/openai_codex_models_service.go
  • backend/internal/service/openai_codex_models_service_test.go
  • backend/internal/service/openai_embeddings.go
  • backend/internal/service/openai_gateway_forward.go
  • backend/internal/service/openai_gateway_service.go
  • backend/internal/service/openai_images.go
  • backend/internal/service/openai_images_responses.go
  • backend/internal/service/openai_ws_forwarder_ingress.go
  • backend/internal/service/openai_ws_forwarder_payload.go
  • backend/internal/service/openai_ws_forwarder_v2.go
  • backend/internal/service/openai_ws_http_bridge.go
  • frontend/src/components/account/CreateAccountModal.vue
  • frontend/src/components/account/__tests__/ModelWhitelistSelector.spec.ts
  • frontend/src/i18n/locales/en/admin/accounts.ts
  • frontend/src/i18n/locales/zh/admin/accounts.ts
  • frontend/src/types/index.ts
  • frontend/src/views/admin/AccountsView.vue
  • frontend/src/views/admin/GroupsView.vue

Activity

  1. HTExplicit commented on Sep 23, 2026

    @HTExplicit
    Owner

    Stale: upstream v0.2.1 is already merged into main (it is an ancestor of f78c2cf; the recorded upstream base is v0.2.7, and v0.2.8 is under review in #196). Closing this old conflict report.

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

Metadata

Metadata

Assignees

No one assigned

    Labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions