-and run <tt>git rebase --continue</tt>. If you can not resolve the merge\r
-failure, running <tt>git rebase --abort</tt> will restore the original <branch>\r
-and remove the working files found in the .dotest directory.</p>\r
+and run <tt>git rebase --continue</tt>. Another option is to bypass the commit\r
+that caused the merge failure with <tt>git rebase --skip</tt>. To restore the\r
+original <branch> and remove the .dotest working files, use the command\r
+<tt>git rebase --abort</tt> instead.</p>\r