search

tresinformal / drakkar

The tresinformal video game called 'Drakkar'
GNU General Public License v3.0
11 stars 4 forks source link

Stefano #492

Closed swom closed 2 years ago

swom commented 2 years ago

Solving merge conflicts on Stefano's branch. Showing how a pull request works to @Yangshen0325

TheoPannetier commented 2 years ago

I took the freedom to convert this into a draft to ensure it isn't merged before the merge conflict is solved 😇

TheoPannetier commented 2 years ago

Hey @swom nice work here, and great that you requested a review from one of our newer devs, this is great to explore the code and get used to reviewing. I see that the PR is rather large, and you did several independent (?) things. I think it would be great to include a short summary of what you worked on in this PR and how you did it? I feel it would help out @Yangshen0325 to understand what you changed and why.

codecov-commenter commented 2 years ago

Codecov Report

Merging #492 (e48156a) into develop (ea2f3f5) will increase coverage by 0.03%. The diff coverage is 100.00%.

:exclamation: Current head e48156a differs from pull request most recent head f72426f. Consider uploading reports for the commit f72426f to get more accurate results

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #492      +/-   ##
===========================================
+ Coverage    92.62%   92.66%   +0.03%     
===========================================
  Files           46       46              
  Lines         2319     2330      +11     
  Branches       140        0     -140     
===========================================
+ Hits          2148     2159      +11     
  Misses         171      171
Impacted Files Coverage Δ
game.cpp 95.63% <100.00%> (+0.06%) :arrow_up:

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 ea2f3f5...f72426f. Read the comment docs.