Skip to content

[fixme] main conflicts with v7#4182

Merged
gh-worker-dd-devflow-36fce6[bot] merged 3 commits intov7from
fix-merge-0ac2a6c4c4-into-v7
Feb 13, 2026
Merged

[fixme] main conflicts with v7#4182
gh-worker-dd-devflow-36fce6[bot] merged 3 commits intov7from
fix-merge-0ac2a6c4c4-into-v7

Conversation

@gh-worker-dd-devflow-36fce6
Copy link

Note

TL,DR: Fix the conflicts and use /resume to merge.
⚠️ Do not mark this pull request as ready for review.

We couldn't automatically merge the commit 0ac2a6c4c4 from main into v7, there is a conflict!

We created this pull request so that you can fix those conflicts by clicking on the Resolve conflicts button at the bottom of this page.

If the conflicts are not trivial, you can also resolve them locally by running the following commands in your terminal:

git fetch origin fix-merge-0ac2a6c4c4-into-v7 v7
git checkout fix-merge-0ac2a6c4c4-into-v7
git merge origin/v7

Once you solved the conflicts, you can finish the merge and push your fix by running:

git merge --continue
git push origin fix-merge-0ac2a6c4c4-into-v7

Finally, you can resume the integration of this change by either:

  • commenting /resume on this pull request, or clicking on the "Resume" button at the bottom of the page if you have Doggo installed.
  • running the following command directly in your terminal while having the fix branch checked out:
    ddr devflow resume
    
    Note: Once the command started, you can exit it at any time and switch branch to keep working locally. It will finish in the background.

Alternatively, you can cancel this operation by commenting this pull request with /resume -c

@BeltranBulbarellaDD
Copy link
Contributor

/resume

@gh-worker-devflow-routing-ef8351
Copy link

gh-worker-devflow-routing-ef8351 bot commented Feb 13, 2026

View all feedbacks in Devflow UI.

2026-02-13 15:12:34 UTC ℹ️ Start processing command /resume


2026-02-13 15:12:37 UTC ℹ️ Devflow: /resume

The v7 branch of browser-sdk has been updated with the latest changes from main

@gh-worker-dd-devflow-36fce6 gh-worker-dd-devflow-36fce6 bot merged commit 68f72c8 into v7 Feb 13, 2026
3 checks passed
@gh-worker-dd-devflow-36fce6 gh-worker-dd-devflow-36fce6 bot deleted the fix-merge-0ac2a6c4c4-into-v7 branch February 13, 2026 15:12
@github-actions github-actions bot locked and limited conversation to collaborators Feb 13, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant