search

Teleopti / styleguide

Teleopti styleguide
http://teleopti.github.io/styleguide/
MIT License
5 stars 24 forks source link

Button groups, input and select fixes #499

Closed oestrogen closed 6 years ago

Halomaple commented 6 years ago

Hi, @oestrogen, can you exclude the commit: Revert stuff I broke a3caf5f5615d23b842588c2e9277e93c088ede68 ? This one will overwrite my new changes on working-hours-picker and wfm-date-range-picker.

oestrogen commented 6 years ago

@Halomaple Sure! How do I most easy do that? Just revert it?

Halomaple commented 6 years ago

You can update your repo with the latest styleguide and cherry pick the four commits you want. https://github.com/Teleopti/styleguide/blob/master/README.md#sync-your-repo-with-latest-teleoptistyleguide

oestrogen commented 6 years ago

What would you like me to cherry pick? I can't see what causes a merge conflict. In https://github.com/Teleopti/styleguide/pull/499/files none of the files in that commit are changed in any way. Haven't I already picked the correct stuff in my merge commit ad9b41b?

Halomaple commented 6 years ago

From the changes https://github.com/Teleopti/styleguide/pull/499/files it shouldn't matter. I thought it might overwrite my changes. No need to cherry pick then.