oui

oui copied to clipboard

Description

Optimization of some math equations inside calc() in scss files was done.

Issues Resolved

Fixes #1002

Check List

• [ ] New functionality includes testing.
• [ ] New functionality has been documented.
• [ ] All tests pass
  • [ ] yarn lint
  • [ ] yarn test-unit
• [X] Update CHANGELOG.md
• [X] Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

For more information on following Developer Certificate of Origin and signing off your commits, please check here.

These same kind of conflicts keep appeared in my previous PR I'm curious about why this kind of conflict actually occurs?

<<<<<<< calc
=======
>>>>>>> main

What does this actually mean?

I'm just gonna make a new PR, a lot of problem with this one

These same kind of conflicts keep appeared in my previous PR I'm curious about why this kind of conflict actually occurs?

<<<<<<< calc
=======
>>>>>>> main

What does this actually mean?

@ShatilKhan Those lines indicate a merge conflict, where git is unsure whether which branch has the "correct" or desired changes. So it keeps both and wraps them in those markers so that you can manually choose (or replace with a combination). The first section is the line(s) as it appears in the calc branch and the second is the line as it appears in the main branch. See https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts and https://code.visualstudio.com/docs/sourcecontrol/overview#_merge-conflicts

Thanks for the explanation @joshuarrrr

I resolved all the conflicts This one is ready for review

It looks like the linter is throwing errors: https://github.com/opensearch-project/oui/actions/runs/7163472679/job/19525060011?pr=1158#step:5:17

Also looks like build got broken: https://github.com/opensearch-project/oui/actions/runs/7163472679/job/19525059465?pr=1158#step:5:123