git rebase content for blog - https://elh.mx/latest/looking-into-git-rebase-and-how-it-looks-in-the-commit-history/

1-create-branches.command

git checkout master
git branch feature-one
git branch feature-two

2-first-branch-commits.tool

git checkout feature-one
echo "Change in feature-one" >> file.txt
git add file.txt
git commit -m "Feature one: change in file.txt"
echo "This is feature-one.txt" > feature-one.txt
git add feature-one.txt
git commit -m "Add feature-one.txt"

3-second-branch-commit.tool

git checkout feature-two
echo "Change in feature-two" >> file.txt
git add file.txt
git commit -m "Feature two: change in file.txt"
echo "This is feature-two.txt" > feature-two.txt
git add feature-two.txt
git commit -m "Add feature-two.txt"

4-master-rebase.tool

git checkout master
git rebase feature-one

5-commit-history.md

• (HEAD -> master) Add feature-one.txt
• Feature one: change in file.txt
• Previous commits on master...

6-git-rebase.sh

git rebase feature-two

7-resolve-merge-conflict.sh

# Edit file.txt to resolve the conflict
git add file.txt
git rebase --continue

8-commit-history.md

• (HEAD -> master) Add feature-two.txt
• Feature two: change in file.txt
• Add feature-one.txt
• Feature one: change in file.txt
• Previous commits on master...