CenterForTheBuiltEnvironment / comfort_tool

CBE Thermal Comfort Tool for ASHRAE-55
http://comfort.cbe.berkeley.edu
Other
90 stars 39 forks source link

Toby cbe amend #8

Closed tobycheung0000 closed 5 years ago

tobycheung0000 commented 6 years ago

1) Adding decscription of air speed fixed at 0.2m/s for PMV calculation in ankle draft risk model. 2) Adding warning sign if MET > 1.3 or Clo > 0.7 3) Description in "Help" is also added.

thoyt commented 6 years ago

Hi @tobycheung0000 - It looks like you reverted the first commit, so there aren't any changes to review. Are you missing a commit somewhere?

tobycheung0000 commented 6 years ago

Hi Tyler,

For me, I can see both commits on 10 July and 26 July on Githuh with all changes inside. As show below:

and

The following is the Github apps screenshot that I am using in my computer:

Can you let me know what I should do so that you can see the changes? Thank you!

Best, Toby

Toby C.T. Cheung, Ph.D.

Research Fellow, Berkeley Education Alliance for Research in Singapore

1 Create Way, #11-01 Create Tower, Singapore 138602 Phone: (SG) +65-9456-4711 <%2B65-8283-5756> (HK) +852-6019-4020 <%2B1-352-871-4100>

On 6 August 2018 at 11:34, Tyler Hoyt notifications@github.com wrote:

Hi @tobycheung0000 https://github.com/tobycheung0000 - It looks like you reverted the first commit, so there aren't any changes to review. Are you missing a commit somewhere?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/CenterForTheBuiltEnvironment/comfort_tool/pull/8#issuecomment-410579608, or mute the thread https://github.com/notifications/unsubscribe-auth/AOgFhO85dvIi6OjfVUxYEe_E6U9l64A4ks5uN7lMgaJpZM4Vhrty .

thoyt commented 6 years ago

@tobycheung0000 - There are two commits: 5c010cf has some changes, and 2e5d16e reverses all of the changes from the first commit. The result is that there is no difference between master and your branch.

Did you not intend to include the revert commit?

tobycheung0000 commented 6 years ago

Hi Tyler,

Now I know what is the problem. My apology on the mistake. Is that okay for you just approve the first commits 5c010cf https://github.com/CenterForTheBuiltEnvironment/comfort_tool/commit/5c010cf3cf6e74d6cca5f2aae2ff9804500484bb with changes compared to the master branch? If not, I will need to commit another pull request, isn't it?

Best, Toby

Toby C.T. Cheung, Ph.D.

Research Fellow, Berkeley Education Alliance for Research in Singapore

1 Create Way, #11-01 Create Tower, Singapore 138602 Phone: (SG) +65-9456-4711 <%2B65-8283-5756> (HK) +852-6019-4020 <%2B1-352-871-4100>

On 8 August 2018 at 01:21, Tyler Hoyt notifications@github.com wrote:

@tobycheung0000 https://github.com/tobycheung0000 - There are two commits: 5c010cf https://github.com/CenterForTheBuiltEnvironment/comfort_tool/commit/5c010cf3cf6e74d6cca5f2aae2ff9804500484bb has some changes, and 2e5d16e https://github.com/CenterForTheBuiltEnvironment/comfort_tool/commit/2e5d16e436c4da14feb95bd68b7cbb13005d10fd reverses all of the changes from the first commit. The result is that there is no difference between master and your branch.

Did you not intend to include the revert commit?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/CenterForTheBuiltEnvironment/comfort_tool/pull/8#issuecomment-411135111, or mute the thread https://github.com/notifications/unsubscribe-auth/AOgFhLWIg3ADixST7DSyHJ4sCSmQOUPIks5uOcydgaJpZM4Vhrty .

thoyt commented 6 years ago

@tobycheung0000 You can revert the revert commit with git revert 2e5d16e then push your branch. If you need to make another pull request that's fine.