Fall back to unsigned push instead of failing when a rebase hits a genuine merge conflict in pushSignedCommits

Fall back to unsigned push instead of failing when a rebase hits a genuine merge conflict in pushSignedCommits #2587