⚠️ Fenix (Firefox for Android) moved to a new repository. It is now developed and maintained as part of: https://github.com/mozilla-mobile/firefox-android
This is an automatic backport of pull request #28720 done by Mergify.
Cherry-pick of 7d84c53e25e58babddd14d495eafd06bb1aded76 has failed:
On branch mergify/bp/releases_v110.0.0/pr-28720
Your branch is up to date with 'origin/releases_v110.0.0'.
You are currently cherry-picking commit 7d84c53e2.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: app/src/main/java/org/mozilla/fenix/components/metrics/MetricsMiddleware.kt
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt
both modified: app/src/main/java/org/mozilla/fenix/components/metrics/MetricsStorage.kt
both modified: app/src/main/java/org/mozilla/fenix/telemetry/TelemetryMiddleware.kt
both modified: app/src/main/java/org/mozilla/fenix/utils/Settings.kt
both modified: app/src/main/res/values/preference_keys.xml
both modified: app/src/test/java/org/mozilla/fenix/components/metrics/DefaultMetricsStorageTest.kt
both modified: app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt
Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
You can also trigger Mergify actions by commenting on this pull request:
- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport ` will backport this PR on `` branch
Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com
No Taskcluster jobs started for this pull request
```js
The `allowPullRequests` configuration for this repository (in `.taskcluster.yml` on the
default branch) does not allow starting tasks for this pull request.
```
Git reported the following error:
```
Rebasing (1/1)
Auto-merging app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt
CONFLICT (content): Merge conflict in app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt
Auto-merging app/src/main/java/org/mozilla/fenix/components/metrics/MetricsMiddleware.kt
Auto-merging app/src/main/java/org/mozilla/fenix/components/metrics/MetricsStorage.kt
CONFLICT (content): Merge conflict in app/src/main/java/org/mozilla/fenix/components/metrics/MetricsStorage.kt
Auto-merging app/src/main/java/org/mozilla/fenix/utils/Settings.kt
CONFLICT (content): Merge conflict in app/src/main/java/org/mozilla/fenix/utils/Settings.kt
Auto-merging app/src/main/res/values/preference_keys.xml
CONFLICT (content): Merge conflict in app/src/main/res/values/preference_keys.xml
Auto-merging app/src/test/java/org/mozilla/fenix/components/metrics/DefaultMetricsStorageTest.kt
CONFLICT (content): Merge conflict in app/src/test/java/org/mozilla/fenix/components/metrics/DefaultMetricsStorageTest.kt
error: could not apply e12411b18... Bug 1814231 - revert growth data removal from github #28429
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm ", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply e12411b18... Bug 1814231 - revert growth data removal from github #28429
```
err-code: B49E7
This is an automatic backport of pull request #28720 done by Mergify. Cherry-pick of 7d84c53e25e58babddd14d495eafd06bb1aded76 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport