「git-rebase」の検索結果

Rebase the current branch onto a target branch using safety checks and an appropriate rebase strategy. Use when invoked as `$git-rebase` or when the user asks to update/rebase a branch.

日本語の概要は準備中です。原文の説明を表示しています。

Rebases every local branch of a fork onto a moved upstream, flags the ones upstream has superseded, and rebuilds the mixdown branch that combines them. Use after fetching a fork's upstream and finding it has advanced far, been force-pushed, or rewritten its history; when several stacked or sibling branches all need bringing forward at once; when a branch was cut from a mixdown and now carries merge commits it should not have; or when asked to rebase all branches, re-mix, or bring a whole worktree set up to date.

日本語の概要は準備中です。原文の説明を表示しています。

Resolve an in-progress git merge or rebase conflict end to end: read the conflict state, recover each side's original intent, resolve every hunk, run the project's checks, and prepare the merge/rebase for an explicitly approved finish. Use when asked to "resolve merge conflicts", "fix this rebase", "finish the merge", or when `git status` shows conflicted (unmerged) paths. NOT for the full ship pipeline that merges the base branch first (see mk:ship); NOT for debugging a runtime bug or test failure unrelated to a conflict (see mk:investigate / mk:fix).

日本語の概要は準備中です。原文の説明を表示しています。