Tutorial for understanding merging a branch in git