Merge branch 'wd/rebase-conflict-guide'

The advice message given when "git rebase" stops for conflicting changes has been improved. * wd/rebase-conflict-guide: rebase: make resolve message clearer for inexperienced users