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

Merge Conflict contextmenu items are disabled in 2.5.0 #3809

Closed
wubzz opened this issue Jul 5, 2017 · 0 comments
Closed

Merge Conflict contextmenu items are disabled in 2.5.0 #3809

wubzz opened this issue Jul 5, 2017 · 0 comments

Comments

@wubzz
Copy link

wubzz commented Jul 5, 2017

Do you want to request a feature or report a bug?
Bug

What is the current behavior?
Majority of options are disabled in the contextmenu.

If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem.
Create a merge conflict in your repository. In the merge conflict dialog, right click a file and try to "Save Local as". The option (amongst others) are disabled.

What is the expected behavior?
That the options are not disabled.

Which versions of GitExtensions, GIT and Windows are affected by this issue? Did this work in previous versions of our tool?
Windows 10, Git Extensions 2.5.0. Yes, worked in previous versions.

http://i.imgur.com/068xtu1.png

In previous versions I could "Save Local as" and keep a copy of the file locally while resolving the conflicts. I saw nothing in the release notes regarding this, so I'm posting this as a bug. Please correct me if I'm wrong!

@jbialobr jbialobr added this to the 2.50.01 milestone Jul 5, 2017
jbialobr added a commit to jbialobr/gitextensions that referenced this issue Jul 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants