Git Workshop

In this workshop we will focus on following sections:

1. Best practises
2. How to write a commit message?
3. Rebasing your own work
4. Rebasing on the base branch

How to write a commit message?

A good commit message is a way to communicate with your colleagues and future yourself.
Please follow this article for more details.

Reference

• https://www.algolia.com/blog/engineering/master-git-rebase/

Pros of Rebase

• Linear commit history
• You can rebase your own work
• Get upto date with main/base branch

Cons of Rebase

• With great power comes great responsibility
• If done not correctly is danger

Pros of local rebasing

• Commits can be organised and manipulated easily
• Helps you write atomic commits

Cons of local rebasing

• It takes time to make changes in specific commits if there are too many commits