Merge feature branches into a target branch and push it to remote.
npx skills add https://github.com/glhewett/public-skills --skill git-merge-into
Please help me install this Agent Skill. Skill: git-merge-into Source: https://github.com/glhewett/public-skills/tree/main/git-merge-into Command: npx skills add https://github.com/glhewett/public-skills --skill git-merge-into
Merge a completed feature branch into a target branch while ensuring the target is up-to-date, preventing accidental loss of work, and surfacing merge conflicts for manual resolution.
Merge the current feature branch into develop, ensure no uncommitted changes, and push the develop branch to the remote repository.
High-intent search queries and answers about installing and using this skill.
To safely merge and push a feature branch, this workflow checks out the target, pulls latest changes, and performs a --no-ff merge before pushing the updated target branch to the remote repository.
If uncommitted changes exist before a git merge, pre-merge validation detects them and warns you before proceeding, preventing accidental loss of work during the branch integration process.
During feature branch integration, merge conflict detection stops the process and presents conflict details for manual resolution instead of attempting automatic resolution, ensuring conflicts are handled explicitly.
Using a --no-ff merge when finalizing feature work in git ensures the target branch records a merge commit, preserving the historical context of the feature branch instead of linearizing the commits.
Yes, you can synchronize a target branch with remote before merging feature work; the process checks out the target branch and pulls the latest changes to ensure it is up-to-date prior to the merge.
saadjsConvert uncommitted changes into small conventional commits via git add -p.
joeylife94Merge pull requests, deploy to production, and verify health via CI/CD pipelines.
pandaworks-software-pltCreate Git branches from local references without upstream inheritance.
ilonatommyConsolidate multiple Git commits into a single commit using rebase, reset, or merge strategies.
