Keyboard shortcuts

Press or to navigate between chapters

Press S or / to search in the book

Press ? to show this help

Press Esc to hide this help

Repeated merge

$ git checkout featurey

Edit app.pl add another line

$ git add app.pl
$ git commit -m "another line"

$ git checkout main
$ git merge featurey

This time the merge was automatic, and it only included the changes since the previous merge.