Closed Meister1593 closed 4 years ago
Going to review the updated changes now, but it looks like there's a merge conflict. I think it has to do with the way your first PR was done since for some reason this PR is trying to also add the same files and make the same changes. Looking at your code_style
branch I see
This branch is 7 commits ahead, 1 commit behind DoubleDeez:master.
I'm not 100% on how to fix it, but you might need to git pull --rebase
from my master branch into your code_style branch
I've made several code style changes over project (not including examples), also some converts (like for to foreach). I wanted to know what would be nice to apply in this project and what should be thrown away.
var
, because sometimes it's useful (when you have obvious name of variable and long type with params), sometimes it's not really (replacingint
withvar
in for-loop is a bit weird)