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.

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

allow commit with nothing staged if it is needed to finish merge #679

Merged
merged 1 commit into from Apr 10, 2017

Conversation

Projects
None yet
2 participants
@beauxq
Contributor

beauxq commented Apr 8, 2017

If a merge conflict resolution results in nothing being staged, git-cola doesn't allow committing. But a commit needs to be done to complete the merge.

allow commit with nothing staged if it is needed to finish merge
If a merge conflict resolution results in nothing being staged, git-cola
doesn't allow committing. But a commit needs to be done to complete the
merge.

davvid added a commit to davvid/git-cola that referenced this pull request Apr 10, 2017

Merge pull request git-cola#679 from beauxq/master
* beauxq/master:
  allow commit with nothing staged if it is needed to finish merge

Signed-off-by: David Aguilar <davvid@gmail.com>

@davvid davvid merged commit 1f2e69b into git-cola:master Apr 10, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment