.git/rebase-apply/patch:95: trailing whitespace.
    
warning: 1 line adds whitespace errors.
error: Failed to merge in the changes.