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

Run merge conflict check on PR rebase/commit #242

Merged
merged 1 commit into from
Mar 24, 2021
Merged

Run merge conflict check on PR rebase/commit #242

merged 1 commit into from
Mar 24, 2021

Conversation

ferferga
Copy link
Member

Runs the merge conflict check after a pull request is synchronized with the branch it's currently tracking.

This way, the label is removed after rebases in each PR and not only with commits on master.

@sonarcloud
Copy link

sonarcloud bot commented Mar 23, 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
No Duplication information No Duplication information

@codecov
Copy link

codecov bot commented Mar 23, 2021

Codecov Report

Merging #242 (d66e6e2) into master (9e82d3d) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #242   +/-   ##
=======================================
  Coverage   33.58%   33.58%           
=======================================
  Files          33       33           
  Lines         658      658           
  Branches      133      133           
=======================================
  Hits          221      221           
  Misses        394      394           
  Partials       43       43           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9e82d3d...d66e6e2. Read the comment docs.

@thornbill thornbill merged commit e88e264 into jellyfin:master Mar 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

2 participants