Skip to content
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

Problems when working with Git #1212

Closed
thefunnyfunyan opened this issue Dec 29, 2016 · 3 comments
Closed

Problems when working with Git #1212

thefunnyfunyan opened this issue Dec 29, 2016 · 3 comments

Comments

@thefunnyfunyan
Copy link

When working with git, if I perform a git merge and there are merge conflicts, git creates an index.lock file. This is preventing me from abort the merge or even delete the repository. If I close cmder, and open up cmd.exe no index.lock file is create and i am able to abort the merge.

@Stanzilla
Copy link
Member

Are you sure you are on the latest version? Because we actively prevent that https://github.com/cmderdev/cmder/blob/master/vendor/clink.lua#L228

@thefunnyfunyan
Copy link
Author

Yes I do have the most recent version.

@glucas
Copy link
Contributor

glucas commented Mar 1, 2017

See the possibly related issue #1060.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants