Open ktf opened 9 years ago
@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.
--continue
git add && git commit
I guess in addition you would clean up the merge-attempt branch, once the merge is successful ?
yes, that's the goal, to complete the remaining commands that are skipped if a merge fails:
@slava77 suggested to have a
--continue
feature to cms-merge-topic. We need to understand how this is different fromgit add && git commit
, which is what you do when you have a merge conflict.