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?
to your account
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 18.104.22.168 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
The text was updated successfully, but these errors were encountered:
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.
Sorry, something went wrong.
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
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.
Thanks a lot appreciated
If I can help in anyway let me know 😉
Successfully merging a pull request may close this issue.