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 button must be disabled for modified-removed conflicts #174

Closed
renatofsp opened this issue Feb 26, 2019 · 4 comments

Comments

@renatofsp
Copy link

commented Feb 26, 2019

When trying to click on merge in external manager nothing happens also when clicking in merge (default from fork) not working as well it was working fine on previous versions

using latest version 1.28.0.0 on Windows 7 x64 professional sp1

this happens when applying a stash that had conflicts when trying to solve those conflicts the merge buttons simply don't work

image

@DanPristupov

This comment has been minimized.

Copy link
Contributor

commented Feb 26, 2019

There's nothing to merge. As you can see the left version is modified while the old one is removed.

This might also happen if you had renamed the file.

@renatofsp

This comment has been minimized.

Copy link
Author

commented Feb 26, 2019

I see your point it makes total sense obviously but I still think that a dialog to choose one or the other should be presented so we (user) can see something happening

@DanPristupov

This comment has been minimized.

Copy link
Contributor

commented Feb 26, 2019

Yes, it looks like a bug. The 'Merge' button must be disabled in that case. We'll fix this in the next update.

As for now, you should select either left or right checkbox in that case.

@renatofsp

This comment has been minimized.

Copy link
Author

commented Feb 26, 2019

Thanks a lot appreciated

If I can help in anyway let me know 😉

@DanPristupov DanPristupov added this to the 1.29 milestone Feb 26, 2019

@DanPristupov DanPristupov changed the title Cannot use external merge tooll Kdiff Merge button must be disabled for modified-removed conflicts Mar 1, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.