Merge the current git branch into origin/dev and push after a successful merge.
npx skills add https://github.com/JoeCP17/LLM-Dot-files --skill dev-deploy-joecp17
Please help me install this Agent Skill. Skill: dev-deploy Source: https://github.com/JoeCP17/LLM-Dot-files/tree/main/codex/skills/dev-deploy Command: npx skills add https://github.com/JoeCP17/LLM-Dot-files --skill dev-deploy-joecp17
It prevents risky or inconsistent deployments by updating your local dev branch from the latest remote, then merging your current branch into it with clear conflict handling.
origin/dev, fast-forwards local dev to match, then merges the source branch.origin/dev only after a successful merge, avoiding pushes on failure.Use Case: You finish implementing a feature on a branch and the user asks you to merge it into dev and deploy by updating the shared development branch.
Use the dev-deploy skill to merge your current branch into the latest origin/dev and push the result to origin.
High-intent search queries and answers about installing and using this skill.
To safely merge a feature branch into dev and push, the workflow fetches origin/dev, fast-forwards your local dev, performs a non-ff merge of your source branch, and pushes only if the merge succeeds without conflicts.
When merge conflicts occur during a dev branch deployment, the process stops immediately without auto-resolution, requiring you to manually choose a resolution path before the updated state can be pushed to origin/dev.
To update your local dev branch from remote before merging, the process fetches origin/dev and fast-forwards your local dev to match the latest shared development state, ensuring a clean working tree beforehand.
No, the dev deployment workflow does not push to origin if the merge fails. It only publishes the updated state to origin/dev after a successful merge and explicit conflict resolution.
The best way to handle a non-ff merge into a shared development branch is to fetch the latest remote, fast-forward local dev, merge the source branch, and stop on conflicts to prevent risky deployments.
Merging into dev requires a clean working tree check to prevent inconsistent deployments, ensuring no uncommitted local changes interfere with the fetch, fast-forward, and non-ff merge steps.
cbleckerSync a local Git branch with its remote using fork-aware fetch and merge.
biz-StreamCreates GitHub pull requests after a successful build and push.
aberrantCodeMerge feature branches into DEV after passing tests and coverage gates.
Knuckles-TeamAutomate Git history fixes using rebase, cherry-pick, and bisect workflows.