Git - Branching Out: Multiple Trains of Thought - merge
Head First Git: A Learner’s Guide to Understanding Git from the Inside Out、 Raju Gandhi(著)、 O’Reilly Mediaの Chapter 2.(Branching Out: Multiple Trains of Thought)、EXERCISE(74/164)の解答を求めてみる。
入出力結果(Terminal, Zsh)
% git branch -v
add-fall-menu 7bb440e update heading
* add-thurs-menu c0fc334 add thursdays menu
master 186fe2e add the main menu
my-first-branch 186fe2e add the main menu
my-new-branch 7bb440e update heading
% git switch master
Switched to branch 'master'
% git merge add-fall-menu
Updating 186fe2e..7bb440e
Fast-forward
fall-menu.md | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 fall-menu.md
% git branch -v
add-fall-menu 7bb440e update heading
add-thurs-menu c0fc334 add thursdays menu
* master 7bb440e update heading
my-first-branch 186fe2e add the main menu
my-new-branch 7bb440e update heading
% ls
fall-menu.md menu.md
% git switch add-fall-menu
Switched to branch 'add-fall-menu'
% ls
fall-menu.md menu.md
% git switch add-thurs-menu
Switched to branch 'add-thurs-menu'
% ls
menu.md thursdays-menu.md
%