LimnoTech / HSPsquared

Hydrologic Simulation Program Python (HSPsquared)
GNU Affero General Public License v3.0
2 stars 0 forks source link

Keep our fork synced with RESPEC's repo #10

Open aufdenkampe opened 4 years ago

aufdenkampe commented 4 years ago

We would all benefit from syncing from the master repo, https://github.com/respec/HSPsquared, anytime it changes and before we do a round of work.

We're all ideally following the collaborative feature branch workflows described in https://github.com/respec/HSPsquared/issues/30.

Look for new commits from RESPEC at https://github.com/respec/HSPsquared/network.

There are two ways of keeping our repo synced.

  1. Use GitHub web application to create a pull request.

    • This is easy and allows for a nice review step before merging.
    • It always creates a merge commit.
    • The default is to request that RESPEC pull from our repo, whereas we want the opposite direction for a sync, to pull into our repo from RESPEC. So configure the GitHub UI to look like this: image
  2. Use the command line to do a git merge upstream/master

cc: @rheaphy

aufdenkampe commented 4 years ago

@steveskrip, I've just fully updated all of our branches with all commits from RESPEC. So, our develop branch has now been updated with Bob's new readUCI functions from his master branch.

aufdenkampe commented 4 years ago

@steveskrip, I just pulled in another round of updates from RESPEC based on the recent work by @PaulDudaRESPEC, including the additional readUCI fixes he mentioned in https://github.com/LimnoTech/HSPsquared/issues/16#issuecomment-724187965.

Also, I learned and used the helpful $ git cherry-pick <commit ID> function from https://clubmate.fi/git-move-commit-between-branches/. This allowed me to move specific, relevant commits from the develop-WaterQuality branch into our develop. This should allow you to complete the testing for #17.

aufdenkampe commented 3 years ago

I just did a round of syncing with RESPEC's develop, as they've been making progress on Water Quality modules and also the WBN import stuff.

I also deleted our develop-WaterQuality branch after PR #18, because it's been fully merged with develop.