Add a --continue feature to the cms-merge-topic

[ktf]

@slava77 suggested to have a --continue feature to cms-merge-topic. We need to understand how this is different from git add && git commit, which is what you do when you have a merge conflict.

[fwyzard]

I guess in addition you would clean up the merge-attempt branch, once the merge is successful ?

[slava77]

yes, that's the goal, to complete the remaining commands that are skipped if a merge fails:

• get back to the starting topic branch
• fast-forward merge of the merge-attempt
• cleanup the merge-attempt