I created a Master repo which is devops-batch-3 and then initialized git on it. Post that I also changed global username, email to show the author details later in a lucid manner.

Then created two text files feature-1 and feature2. Both of them is added for staging and then commit is done but sequentially.

Concept of GIT Revert and GIT Reset (Never use this in practical/production scenario)

Concept of Cherry Pick

Merge

Using Github for Merge is safer than AWS CLI. In the master branch you created 2 features and then you have developers who created feat3,4,5 commit under branch dev.

Te last 5th commit is all good and then you feel to merge to master. This is called as Merge.

Dev to master merge (You will select HEAD of the dev and merge to the HEAD of master.

Difference between Merge & Rebase

Rebase: Entire History is merged in a linear manner.

Merge : Only the Head is merged.