-
Notifications
You must be signed in to change notification settings - Fork 447
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
Merge additional commits from 7.7 branch #5918
Conversation
Change on_files_included/excluded signature
Can one of the admins verify this patch? |
Kudos, SonarCloud Quality Gate passed! 0 Bugs No Coverage information |
ok to test |
Please don't use the "merge" button in GitHub - it will create an additional "pseudo-branch" if you do. All in-repository branches must be merged by hand in console Git to circumvent this problem. I'll do it now. |
Done |
Source? Just curious since I've never had a problem with this before |
See #5427 for instance. Now, I realize this is probably the result of merging from a personal fork. However, in the past, we often had to merge from personal branches because of hand-resolved conflicts. |
It seems for some reason commits were added after the 7.7 branch was first merged into devel. These commits also include a fix to on_reload_torrent_info()
It's missing all (4) commits from January 1st, and "Fix database upgrade fixes" from December 23rd, but it should be fine since it can merge automatically
Edit: I checked each of the commits missing and it appears to be completely fine to merge