-
-
Notifications
You must be signed in to change notification settings - Fork 3.4k
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
more css cleanup #14510
more css cleanup #14510
Conversation
Codecov Report
@@ Coverage Diff @@
## master #14510 +/- ##
============================================
+ Coverage 50.44% 50.45% +<.01%
Complexity 14428 14428
============================================
Files 500 500
Lines 67841 67828 -13
============================================
Hits 34220 34220
+ Misses 33621 33608 -13 |
why is it not working? |
@BO41 you need to rebase on master :) |
My guess is that you started working and then somehow added more updated commits after I pushed those to master. Perhaps with git merge. Regardless, it seems like they've somehow also changed the commit ID (the hash) which is why they're showing here as new commits. Probably the cleanest way to fix it is for either you or whomever merges this to use git cherry-pick to take only your two commits from this branch. When you're updating a branch with changes from origin/master, but already have changes, I prefer |
Signed-off-by: Lukas Walter <lukasw41@gmail.com>
Signed-off-by: Lukas Walter <lukasw41@gmail.com>
@ibennetch I hope I fixed most of it now (with a lot of help of @williamdes , thx :)) |
...still failing 😢 if someone can help me, again |
@BO41 Do not worry @ibennetch What is the purpose of |
Signed-off-by: Lukas Walter <lukasw41@gmail.com>
Signed-off-by: Lukas Walter <lukasw41@gmail.com>
@williamdes should I be worried about DCOs failing? |
@BO41 Yes ! @ibennetch @nijel Just a question : why do you not use your GPG key to sign commits ? |
replaced with #14532 |
even more css code cleanup.
some code standards and automated formating would be nice to see and have. not sure if this is easy to realize.
please review my changes and have a good day :)