[fixme] #2883 conflicts with staging-30 #2893
Merged
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 merge the commit 612c73e5bd from #2883 into staging-30, 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 cancel this operation by commenting this PR with
/resume -c