Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull Sonarr commit 'Fixed: A potential issue when extra files for multiple series have the same relative path' #2760

Closed
servarr bot opened this issue Apr 13, 2022 · 0 comments
Labels
conflict conflict - cannot merge, needs resolution sonarr-pull pull from sonarr commit

Comments

@servarr
Copy link
Contributor

servarr bot commented Apr 13, 2022

Pull Sonarr/Sonarr@a6a68b4

git cherry-pick -ex a6a68b4cae7688506c45ff6cf10989fe6596c274

This commit has 3 conflict(s)

You can ask me to close all, open pr here or open pr everywhere

AB#2985

@servarr servarr bot added conflict conflict - cannot merge, needs resolution sonarr-pull pull from sonarr commit labels Apr 13, 2022
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
conflict conflict - cannot merge, needs resolution sonarr-pull pull from sonarr commit
Projects
None yet
Development

No branches or pull requests

0 participants