Issue #78 - Make the Manually rebasing a patch that has conflicts video