search

CH-Earth / summa

Structure for Unifying Multiple Modeling Alternatives:
http://www.ral.ucar.edu/projects/summa
GNU General Public License v3.0
80 stars 105 forks source link

Fix line277 check icond.f90 #504

Closed iamhappytoo closed 2 years ago

iamhappytoo commented 2 years ago

Make sure all the relevant boxes are checked (and only check the box if you actually completed the step):

wknoben commented 2 years ago

Hi Zhaoxin, thanks for the update. Can I ask you for one more small change?

We prefer to merge new changes into the development branch and keep the master branch for stable releases only. When I tried to change the target branch of this PR it seems we have small merge conflict going on, and also an extra commit that we do not need in this PR.

Fixing this would require:

  1. Making sure your local copy has the correct remote set: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/configuring-a-remote-for-a-fork Typically you would call this remote upstream and have it point to https://github.com/CH-Earth/summa
  2. Update your local copy of the develop branch to match the version that is available here: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork You'll probably want the text under the header Syncing a fork from the command line and replace their use of the main branch with our develop.
  3. Make sure your changes are still present and either update this PR or make a new one (I'm a bit unsure about what will work here)
iamhappytoo commented 2 years ago

Hi Wouter,

Sorry for the confusion and inconveniences, and thank you for the helpful information! I just created a new PR from my local develop branch to upstream develop branch, and cleaned the extra commit in the new PR. Please feel free to let me know if there are any more issues with that, thank you so much!

Best wishes, Zhaoxin

On Mon, Mar 14, 2022 at 12:14 PM Wouter Knoben @.***> wrote:

Hi Zhaoxin, thanks for the update. Can I ask you for one more small change?

We prefer to merge new changes into the development branch and keep the master branch for stable releases only. When I tried to change the target branch of this PR it seems we have small merge conflict going on, and also an extra commit that we do not need in this PR.

Fixing this would require:

  1. Making sure your local copy has the correct remote set: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/configuring-a-remote-for-a-fork Typically you would call this remote upstream and have it point to https://github.com/CH-Earth/summa
  2. Update your local copy of the develop branch to match the version that is available here: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork You'll probably want the text under the header Syncing a fork from the command line and replace their use of the main branch with our develop.
  3. Make sure your changes are still present and either update this PR or make a new one (I'm a bit unsure about what will work here)

— Reply to this email directly, view it on GitHub https://github.com/CH-Earth/summa/pull/504#issuecomment-1067190696, or unsubscribe https://github.com/notifications/unsubscribe-auth/AHYNHWQPVRM2H5XTDATASMTU76FV7ANCNFSM5PYXWWKA . Triage notifications on the go with GitHub Mobile for iOS https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675 or Android https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub.

You are receiving this because you authored the thread.Message ID: @.***>

-- Zhaoxin Ban Ph.D. Candidate Land Surface Hydrology Research Group http://hydro.ucla.edu/ University of California, Los Angeles Phone (O): +1 (424)385-4256

wknoben commented 2 years ago

No problem,thanks for the new PR. I'll close this one and we'll take it from there