Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

For #20919 quit the app after removing a study. (backport #20933) #20943

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 20, 2021

This is an automatic backport of pull request #20933 done by Mergify.
Cherry-pick of d301998 has failed:

On branch mergify/bp/releases_v92.0.0/pr-20933
Your branch is up to date with 'origin/releases_v92.0.0'.

You are currently cherry-picking commit d3019986a.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   app/src/main/java/org/mozilla/fenix/settings/studies/StudiesAdapter.kt
	deleted by us:   app/src/main/java/org/mozilla/fenix/settings/studies/StudiesInteractor.kt
	both modified:   app/src/main/res/values/strings.xml
	deleted by us:   app/src/test/java/org/mozilla/fenix/settings/studies/DefaultStudiesInteractorTest.kt
	deleted by us:   app/src/test/java/org/mozilla/fenix/settings/studies/StudiesAdapterTest.kt

no changes added to commit (use "git add" and/or "git commit -a")

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.

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 <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

(cherry picked from commit d301998)

# Conflicts:
#	app/src/main/java/org/mozilla/fenix/settings/studies/StudiesAdapter.kt
#	app/src/main/java/org/mozilla/fenix/settings/studies/StudiesInteractor.kt
#	app/src/main/res/values/strings.xml
#	app/src/test/java/org/mozilla/fenix/settings/studies/DefaultStudiesInteractorTest.kt
#	app/src/test/java/org/mozilla/fenix/settings/studies/StudiesAdapterTest.kt
@mergify mergify bot requested review from a team as code owners August 20, 2021 15:16
@mergify mergify bot added the conflicts label Aug 20, 2021
@firefoxci-taskcluster
Copy link

No Taskcluster jobs started for this pull request
The `allowPullRequests` configuration for this repository (in `.taskcluster.yml` on the
default branch) does not allow starting tasks for this pull request.

@Amejia481 Amejia481 closed this Aug 20, 2021
@mergify mergify bot deleted the mergify/bp/releases_v92.0.0/pr-20933 branch August 20, 2021 16:15
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