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

more css cleanup #14510

Closed
wants to merge 4 commits into from
Closed

more css cleanup #14510

wants to merge 4 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Jul 22, 2018

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 :)

@codecov
Copy link

codecov bot commented Jul 22, 2018

Codecov Report

Merging #14510 into master will increase coverage by <.01%.
The diff coverage is 0.68%.

@@             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

@ghost
Copy link
Author

ghost commented Jul 22, 2018

why is it not working?
and why are there commits done by @ibennetch ?

@williamdes
Copy link
Member

@BO41 you need to rebase on master :)

@ibennetch
Copy link
Member

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 git rebase origin/master as that preserves your changes and doesn't clutter the log with merge commits.

Lukas Walter added 2 commits July 23, 2018 00:15
Signed-off-by: Lukas Walter <lukasw41@gmail.com>
Signed-off-by: Lukas Walter <lukasw41@gmail.com>
@ghost
Copy link
Author

ghost commented Jul 22, 2018

@ibennetch I hope I fixed most of it now (with a lot of help of @williamdes , thx :))

@ghost
Copy link
Author

ghost commented Jul 23, 2018

...still failing 😢

if someone can help me, again

@williamdes
Copy link
Member

@BO41 Do not worry codecov/patch often fails for no good reason, I still do not understand what that is.

@ibennetch What is the purpose of codecov/patch ?

BO41 added 2 commits July 23, 2018 12:50
Signed-off-by: Lukas Walter <lukasw41@gmail.com>
Signed-off-by: Lukas Walter <lukasw41@gmail.com>
@ghost
Copy link
Author

ghost commented Jul 23, 2018

@williamdes should I be worried about DCOs failing?

@williamdes
Copy link
Member

williamdes commented Jul 23, 2018

@BO41 Yes !
I use the following command to fix all my commits before pushing them to remote
git rebase --exec 'git commit --amend --no-edit --no-verify --gpg-sign --signoff' origin/master
If you dont have a gpg key ommit --gpg-sign

@ibennetch @nijel Just a question : why do you not use your GPG key to sign commits ?

@ghost ghost mentioned this pull request Jul 28, 2018
@ghost
Copy link
Author

ghost commented Jul 29, 2018

replaced with #14532

@ghost ghost closed this Jul 29, 2018
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants