You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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:
Use the command line to do a git merge upstream/master
@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.
@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 #16 (comment).
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.
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 respec#30.
Look for new commits from RESPEC at https://github.com/respec/HSPsquared/network.
There are two ways of keeping our repo synced.
git merge upstream/master
cc: @rheaphy
The text was updated successfully, but these errors were encountered: