merge

To safely merge a topic branch, the process checks for uncommitted worktree changes, resolves conflicts, and validates post-merge ancestry without force-pushing. This preserves commit history integrity when moving completed session work back into the base branch.

Git conflict resolution during a branch merge is guided by identifying conflicted files, resolving them carefully, and completing the merge commit. This workflow ensures worktree safety and prevents accidental history rewriting when merging isolated session changes.

Yes, you can merge session work without force-pushing or skipping hooks by applying clean staging checks and post-merge ancestor validation. This approach maintains commit history integrity while safely moving completed work from an isolated branch into the main branch.

Git requires a clean staging check before merging to ensure worktree safety and prevent losing uncommitted changes. Pre-merge protection verifies the current worktree is clean before moving completed changes from a topic branch into the merge base branch.

To validate a worktree after a git branch merge, confirm a clean worktree state and ensure the topic branch is an ancestor of the merged branch. This post-merge validation verifies the merge result without requiring force-pushes.