Skip to content

Bryn/test pr#21

Merged
mergify[bot] merged 6 commits intodevfrom
bryn/test-pr
Jan 22, 2025
Merged

Bryn/test pr#21
mergify[bot] merged 6 commits intodevfrom
bryn/test-pr

Conversation

@BrynCooke
Copy link
Owner

Description here

Fixes #issue_number


Checklist

Complete the checklist (and note appropriate exceptions) before the PR is marked ready-for-review.

  • Changes are compatible1
  • Documentation2 completed
  • Performance impact assessed and acceptable
  • Tests added and passing3
    • Unit Tests
    • Integration Tests
    • Manual Tests

Exceptions

Note any exceptions here

Notes

Footnotes

  1. It may be appropriate to bring upcoming changes to the attention of other (impacted) groups. Please endeavour to do this before seeking PR approval. The mechanism for doing this will vary considerably, so use your judgement as to how and when to do this.

  2. Configuration is an important part of many changes. Where applicable please try to document configuration examples.

  3. Tick whichever testing boxes are applicable. If you are adding Manual Tests, please document the manual testing (extensively) in the Exceptions.

@BrynCooke BrynCooke added the backport-1.x Backport this PR to 1.x label Jan 22, 2025
@BrynCooke
Copy link
Owner Author

@mergify rebase

@mergify
Copy link

mergify bot commented Jan 22, 2025

rebase

❌ Base branch update has failed

Details

Git reported the following error:

Rebasing (1/5)
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git rebase --skip'
interactive rebase in progress; onto 85da2691
Last command done (1 command done):
   pick a80938d2 Cleanup post router-bridge removal (#6512)
Next commands to do (4 remaining commands):
   pick 553083e8 docs: instrumentation examples (#6487)
   pick 4fc63d55 chore(deps): Update dev dependencies with `npm audit fix` (#6544)
  (use "git rebase --edit-todo" to view and edit)
You are currently rebasing branch 'bryn/test-pr' on '85da2691'.
  (all conflicts fixed: run "git rebase --continue")

nothing to commit, working tree clean
Could not apply a80938d2... Cleanup post router-bridge removal (#6512)

@BrynCooke
Copy link
Owner Author

@mergify update

@mergify
Copy link

mergify bot commented Jan 22, 2025

update

☑️ Nothing to do

Details
  • #commits-behind > 0 [📌 update requirement]
  • -closed [📌 update requirement]
  • -conflict [📌 update requirement]
  • queue-position = -1 [📌 update requirement]

@BrynCooke
Copy link
Owner Author

@mergify queue

@mergify
Copy link

mergify bot commented Jan 22, 2025

queue

✅ The pull request has been merged automatically

Details

The pull request has been merged automatically at 99f5b36

@mergify mergify bot merged commit 99f5b36 into dev Jan 22, 2025
3 checks passed
BrynCooke added a commit that referenced this pull request Jan 22, 2025
* Cleanup post router-bridge removal (apollographql#6512)

* docs: instrumentation examples (apollographql#6487)

Co-authored-by: Bryn Cooke <BrynCooke@gmail.com>

* chore(deps): Update dev dependencies with `npm audit fix` (apollographql#6544)

* Needs backporting

* Needs backporting

---------

Co-authored-by: Simon Sapin <simon@apollographql.com>
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
Co-authored-by: Jesse Rosenberger <git@jro.cc>
Co-authored-by: bryn <bryn@apollographql.com>
(cherry picked from commit 99f5b36)
@BrynCooke BrynCooke mentioned this pull request Jan 22, 2025
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-1.x Backport this PR to 1.x

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants