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

[FEATURE] Offer to lauch a merge tool when throwing error beacuse target contents were changed #193

Open
desk7 opened this issue Jan 22, 2025 · 0 comments

Comments

@desk7
Copy link

desk7 commented Jan 22, 2025

Is your feature request related to a problem? Please describe.
Git often delete the symlink to .gitconfig and replace it with a new .gitconfig when changing settings. So when I dotter-deploy, I often receive the error

[ERROR] Updating template ".gitconfig" -> "C:\\Users\\USER/.gitconfig" but target contents were changed. Skipping
[ERROR] Some files were skipped. To ignore errors and overwrite unexpected target files, use the --force flag.

I'm always frustrated because I have to manually open the source file and the target file in winmerge to solve the conflict and then I can deploy.

Describe the solution you'd like
I'd like dotter to offer me the possibility to launch a custom merge tool (also the git default one) that opens the two files and let me rapidly resolve the conflict, saving the changes in the source file.

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

1 participant