finishing-a-development-branch

To safely merge a git feature branch, you need to verify tests pass, determine the correct base branch like main or develop, and execute a guarded merge with proper cleanup. This workflow automates those safety checks.

Determining the base branch for a git merge involves finding the closest common ancestor among main, master, or develop. This ensures your feature branch integrates into the correct target without conflicting branch histories.

Yes, you can create a pull request and clean up local branches by selecting the push and PR option. This guarded flow presents four choices including local merge, push and PR, preserve worktree, or discard with cleanup.

You should verify tests before merging a feature branch to prevent breaking changes from entering the base branch. The workflow enforces test verification by running the appropriate suite and halting immediately on any failures.

Yes, this branch completion workflow supports projects using develop branches. It automatically determines the closest common ancestor among main, master, or develop to select the appropriate integration target for your project structure.

If you want to discard a git feature branch safely, the guarded merge flow provides a discard option with safety checks and cleanup. You can also choose to merge locally, push and PR, or preserve the worktree.