Automated rebase onto upstream/trunk is failing #9

Activity

1. github-actions commented on Nov 2, 2026

   

   github-actionsBot

   on Nov 2, 2026 – with GitHub Actions

   Author

   More actions

   The scheduled rebase of `` onto upstream/trunk failed and needs manual resolution.

   Conflicting files:

   internal/config/config.go
   pkg/cmd/factory/default.go
   

   Git output:

   Rebasing (1/5)
   error: could not apply c3cb4f9b1... auth: add per-owner account mapping to fix multi-account token selection
   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 c3cb4f9b1... # auth: add per-owner account mapping to fix multi-account token selection
   

   To resolve: fetch upstream/trunk, run git rebase upstream/trunk, fix the conflicts above, then force-push.
2. github-actions commented on Nov 9, 2026

   

   github-actionsBot

   on Nov 9, 2026 – with GitHub Actions

   Author

   More actions

   The scheduled rebase of `` onto upstream/trunk failed and needs manual resolution.

   Conflicting files:

   internal/config/config.go
   pkg/cmd/factory/default.go
   

   Git output:

   Rebasing (1/5)
   error: could not apply c3cb4f9b1... auth: add per-owner account mapping to fix multi-account token selection
   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 c3cb4f9b1... # auth: add per-owner account mapping to fix multi-account token selection
   

   To resolve: fetch upstream/trunk, run git rebase upstream/trunk, fix the conflicts above, then force-push.