Page History

...

1. Release status: Pam/Joe
   1. Style Guide was merged https://hyperledger-fabric.readthedocs.io/en/latest/style_guide.html
      
   2. Cherry picking and Squash and commit
2. New CC Lifecycle Tutorial Draft PR: https://github.com/hyperledger/fabric/pull/666
3. Deployment Guide
   1. Process Overview
   2. CA Deployment
4. LTS on 1.4 and 2.x discussion - Anthony (as raised on Eastern hemi call) See contributor meeting recording from Jan 22,2020 Contributor Meetings 2019
   
   1. Add LTS policy topic?
5. Latest status on tokens requested

...

Video of this week's session at: Recordings

Squashing commits

Squashing commit before a merge is important so that you can cherry-pick the PR to another branch.

• 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.

...