Dhanushka, thanks for writing this summary of the differences of git merge and git rebase. Git skills are essential these days. One thing that I think might be nice to add is the possible problems that can arise from a rebase of branches that are each several commits apart, compared to a git merge. As far as my preference, it depends on the situation, as you said. I like the neatness of a rebase but sometimes merge is easier and faster.