merge-main

To merge main into a feature branch automatically, this Skill stashes uncommitted changes, pulls the latest main with a progress indicator, merges the branches, and restores your stashed work. It guides you through resolving any merge conflicts interactively during the process.

Uncommitted changes are safely stashed before the merge begins and automatically restored after the merge is complete. This prevents losing local work during the Git pull and merge operations.

Yes, you can resolve Git merge conflicts interactively or through automated strategies like accepting ours or theirs. The Skill guides you through conflict resolution while merging the main branch into your current feature branch.

Yes, the merge main automation requires Git command-line tools and PowerShell execution to run. It is designed for software development environments needing robust version control management.

The best way to handle Git branch merging without losing local work is using an automated workflow that stashes uncommitted changes, pulls main, merges, resolves conflicts, and restores the stash. This ensures your feature branch stays up-to-date safely.

Merge conflicts happen when changes in your feature branch overlap with updates pulled from main. This Skill handles conflict resolution by guiding you through interactive prompts or applying automated strategies to accept ours or theirs.