[fixme] #4077 conflicts with staging-03 #4081
Conversation
|
I have read the CLA Document and I hereby sign the CLA 1 out of 2 committers have signed the CLA. |
…5637f-into-staging-03 * origin/staging-03: [skip ci] #4060 conflicts with staging-03 ✨[PANA-3971] Add a more compact experimental DOM mutation encoding 📈 [PANA-5371] Include encoding in segment telemetry 📈 [PANA-5371] Add missing telemetry for adoptedStyleSheets 🐛 [RUM-13693] make sure click actions are sent on page exit Move changeConversions.ts to changeConversions.specHelper.ts Add serializeNode tests to cover untested serialization behaviors ChangeRecord to FullSnapshotRecord conversion should not serialize 0-valued rr_scrollLeft/rr_scrollTop Fix a minor inconsistency in the conversion code ✨[PANA-3971] Add a more compact experimental DOM mutation encoding
|
/resume |
|
View all feedbacks in Devflow UI.
Resuming integrating commit e65a75637f into staging-03 Use ⏳ Processing Gitlab pipeline 90527568... |
Note
TL,DR: Fix the conflicts and use
⚠️ Do not mark this pull request as ready for review.
/resumeto merge.We couldn't automatically merge the commit e65a75637f from #4077 into staging-03, 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:
Once you solved the conflicts, you can finish the merge and push your fix by running:
Finally, you can resume the integration of this change by either:
/resumeon this pull request, or clicking on the "Resume" button at the bottom of the page if you have Doggo installed.Alternatively, you can cancel this operation by commenting this pull request with
/resume -c