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

Merge additional commits from 7.7 branch #5918

Closed
wants to merge 7 commits into from
Closed

Merge additional commits from 7.7 branch #5918

wants to merge 7 commits into from

Conversation

Shidouuu
Copy link

@Shidouuu Shidouuu commented Jan 9, 2021

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

@tribler-ci
Copy link
Contributor

Can one of the admins verify this patch?

@sonarcloud
Copy link

sonarcloud bot commented Jan 9, 2021

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@devos50
Copy link
Contributor

devos50 commented Jan 10, 2021

ok to test

@ichorid
Copy link
Contributor

ichorid commented Jan 10, 2021

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.

@ichorid ichorid closed this Jan 10, 2021
@ichorid
Copy link
Contributor

ichorid commented Jan 10, 2021

Done

@Shidouuu
Copy link
Author

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.

Source? Just curious since I've never had a problem with this before

@ichorid
Copy link
Contributor

ichorid commented Jan 10, 2021

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

5 participants