calculate_fibo_*の模範解答 - mixi-inc/GitTraining GitHub Wiki

git checkout master
git status
prove -r t

git merge feature/calculate_fibo_five
git mergetool
git status
prove -r t
git commit

git status
git merge feature/calculate_fibo_six_and_more
git mergetool
git status
prove -r t
git commit

• ※出直すときはgit merge --abort