-
Notifications
You must be signed in to change notification settings - Fork 235
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
Use locale for by the numbers animation #606
base: master
Are you sure you want to change the base?
Conversation
…mmas previously it is just displaying the numbers without commas
I had limited time and stopped after reading the commit message. Please follow our guidance, and the git convention of restricting the length of the first line. GitHub correctly splits the commit message midword to indicate the betrayal of convention. See 67069b5 rendered by GitHub. |
Add backlink to prior discussion; #600 outstanding comments were;
In future you can and should update the existing pull request rather than create a new one. Just change your branch HEAD and force push. That will keep the discussion in one place, and minimise notifications to other developers. 😁 |
@quozl I got it now I ll be updating the commit message again without making new pr thanks 😊 |
Please resolve conflicts (i.e. once I saw there was conflict, there was no need for further review at this time). |
@pikurasa i m not getting why there are so many conflicts happening with this part of code now the animation is not working in my device after the latest pull from master |
Thanks. That's interesting. Perhaps you pulled from master causing a merge but without doing a rebase. GitHub does not express divergence and merges well, which is why we recommend rebasing, squashing, and generally avoiding merge commits. Here's what I did to diagnose your situation, using my own repository clone;
Looking at your commit e264e2e it is a merge of your previous commit 67069b5 with three other commits that were on master branch; f80021f, 2e4aa43, and b5ee41f. Your change is being made to js/custom.js Of these commits, only 2e4aa43 changes this file, so this commit is where a merge must occur. Unfortunately, we let through from @saumyashahi some unnecessary whitespace changes. Your change also has unncessary whitespace change. We should all be more careful in future. Dropping your merge commit ( It was easy for me to edit the file, choose which of the conflicted sections to keep, and then Now a lot of people bail out at this point and start a new pull request, but that's the wrong way to solve the problem, and is impolite as it causes notifications and splits the discussion. So please keep that out of your mind as an option. That said, while doing the merge by hand I noticed again your commit message was not correctly written. Please do fix it before we merge. written by a human |
updating the counter animation which now displays the numbers with commas previously it is just displaying the numbers without commas @quozl @pikurasa review it