Release GitDonkey 1.4.0 · NathanCart/gitdonkey

Resolve conflicts with AI. In the merge tool, Resolve with AI asks the AI provider you set up for commit messages to suggest a resolution for each conflict, with a one-line reason and how confident it is. Nothing changes until you press Use suggestion (or Edit it first, or use them all), and you still save and mark the file resolved yourself.

Stashing with conflicts. Instead of Git's "could not write index", GitDonkey now says which files are still conflicted and takes you to them with Show conflicts. Other actions blocked by conflicts explain themselves the same way.
A stash pop that conflicts now says Git kept the stash, so you know to delete it once you're happy.
Repeated errors count up on one notice (×3) instead of stacking.

On 1.1.0 or later, GitDonkey offers this update itself.

Navigation Menu