Hyperledger is committed to creating a safe and welcoming community for all. For more information please visit our Code of Conduct: 2020 02 14 DWG Agenda
Announcements
...
Video of this week's session at: Recordings
Squashing commits
- Make sure your branch is up to date with the master branch.
- Run git rebase -i master.
- You should see a list of commits, each commit starting with the word "pick".
- Make sure the first commit says "pick" and change the rest from "pick" to "squash". -- This will squash each commit into the previous commit, which will continue until every commit is squashed into the first commit.
- Save and close the editor.
- It will give you the opportunity to change the commit message.
- Save and close the editor again.
- Then you have to force push the final, squashed commit to your branch.
Cherry-picking across release branches
In the following example we want to cherry-pick a commit from the master branch into the release-2.0 branch:
git checkout release-2.0
if your branch is behind run git pull
After running this command you might see:
- Switched to branch 'release-2.0'
- Your branch is behind 'upstream/release-2.0' by 5 commits, and can be fast-forwarded.
Therefore:
- Use "git pull" to update your local branch
- git push origin release-2.0
git checkout -b <my2.0branch>
git cherry-pick <sha from master branch>
git push origin <my2.0branch>
Then create a PR off of your branch to the release-2.0 branch.
Quarterly reports
Upcoming reports
...