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.

Sign up for GitHub

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

Jump to bottom

It would be nice to notify the user if there are un-resolved conflicts in the merged file before winmerge closed #1855

Open
asmwarrior opened this issue May 16, 2023 · 0 comments
Open

It would be nice to notify the user if there are un-resolved conflicts in the merged file before winmerge closed #1855

asmwarrior opened this issue May 16, 2023 · 0 comments
Labels
3-way compare/merge enhancement

Comments

@asmwarrior
Copy link

Hi, this is a feature request. Mainly from this discussion:

What is the correct way to config winmerge as merge tool under Windows, and using git-for-windows · WinMerge/winmerge · Discussion #1853

The notification is useful when we are in the git mergetool stage, but there are some un-resolved conflicts remaining before we close the winmerge.
@asmwarrior asmwarrior changed the title It would be nice to notice if there are un-resolved conflicts in the merged file before winmerge closed It would be nice to notify the user if there are un-resolved conflicts in the merged file before winmerge closed May 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
3-way compare/merge enhancement
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@sdottaka @asmwarrior