search

Raghwendra-Dey / productivity_meter

Productivity meter for measuring productivity of solving problems
https://raghwendra-dey.github.io/productivity_meter/
MIT License
13 stars 23 forks source link

The pop ups don't work #83

Closed kri-bhawna closed 3 years ago

kri-bhawna commented 3 years ago

fixes #78

kri-bhawna commented 3 years ago

@Raghwendra-Dey I have removed the bug regarding pop-ups not working properly. I have checked everything from my side. Do give your feedback regarding this.

Raghwendra-Dey commented 3 years ago

@kri-bhawna you should write fixes #78 . Not only the issue_number. Adding fixes, closes, resolved, etc. automatically closes that issue, if the PR is merged.

Raghwendra-Dey commented 3 years ago

And Also, I think you have not made your local clone apt with the upstream:master, and worked on that same old copy, and hence you patch don't have the recent changes. Please sync you path with the recent version of the master, and then make your changes and update the PR. TIP: Never forget to sync you clone with the upstream:master, before starting on a completely new issue. tL;dr make the site look exactly same as it looks now, and then remove the bug.

kri-bhawna commented 3 years ago

@Raghwendra-Dey I checked for the files which need to be updated (index.html and style.css), and tried to update them. But, it is showing that branch has conflicts. I checked the code and was trying to resolve the conflicts. But both the codes which are having conflicts are the same. Please help me regarding this. Should I create a new PR or should I keep the master branch style.css in this PR only and resolve conflicts. Also, I think that creating a new PR will reduce the probability of any further mistakes.

Raghwendra-Dey commented 3 years ago

@Raghwendra-Dey I checked for the files which need to be updated (index.html and style.css), and tried to update them. But, it is showing that branch has conflicts. I checked the code and was trying to resolve the conflicts. But both the codes which are having conflicts are the same. Please help me regarding this. Should I create a new PR or should I keep the master branch style.css in this PR only and resolve conflicts. Also, I think that creating a new PR will reduce the probability of any further mistakes.

First of all make sure you make a backup of your current version of the repo(having all the changes and bug fixes) so that you dont lose some work. Then you can have a look at this This would update your fork's master with the master of the original repo. Than you can try to again git clone in somewhere else(maybe if you were previously working in Downloads, so now try to git clone on Desktop) now just redo the changes you have done before on this new clons's files(you can refer your previous backup files for help) to fix that bug.

kri-bhawna commented 3 years ago

@Raghwendra-Dey I tried the method suggested by you, but it is not working. May I create another PR for this or use the resolve conflicts option given at the bottom of this tab and save master branch code (as I have not touched the style.css code)?

Raghwendra-Dey commented 3 years ago

Either of them is fine