[fixme] main conflicts with v6 #3247
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![dd-devflow[bot]](https://avatars.githubusercontent.com/u/365230?s=60&v=4){kind=small}
* 👷 Update all non-major dependencies * Fix for lint update --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: zcy <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We couldn't automatically merge the commit c4b6046104 from the main branch of browser-sdk into v6, there is a conflict!
We created this pull request so that you can fix those conflicts by clicking on the
Resolve conflictsbutton 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:
When this is done, DO NOT MARK THIS PR AS READY FOR REVIEW but comment it with
/resume, we will merge the fix branch into the target branch for you.Alternatively, you can also reset the integration branch by commenting this pull request with
/reset-branch -b v6.