New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add conflict resolution options to git-cms-merge-topic. #67

Open

ktf opened this issue Aug 5, 2014 · 0 comments

Contributor

ktf commented Aug 5, 2014

git-cms-merge-topic is a very useful tool, but it lacks the
functionality to continue after solvinf conflicts so far. Usually, I
solve the conflicts, commit the solutions and execute the lines after
'git merge --no-ff [...]' manually.
It would be great, if a corresponding option "-c/--continue" (and also
"-a/--abort") could be added.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment