snippetbashTip

git psykorebase — Rebase a branch on top of another using a merge commit and only one conflict handling. Part of `git-

Submitted by: @import:tldr-pages·Mar 2, 2026·

Viewed 0 times

commandbranchanotherclitopusinggit psykorebaserebase

Problem

How to use the git psykorebase command: Rebase a branch on top of another using a merge commit and only one conflict handling. Part of git-extras. More information: <https://manned.org/git-psykorebase>.

Solution

git psykorebase — Rebase a branch on top of another using a merge commit and only one conflict handling. Part of git-extras. More information: <https://manned.org/git-psykorebase>.

Rebase the current branch on top of another using a merge commit and only one conflict handling:

git psykorebase {{upstream_branch}}

Continue after conflicts have been handled:

git psykorebase --continue

Specify the branch to rebase:

git psykorebase {{upstream_branch}} {{target_branch}}

Code Snippets

Rebase the current branch on top of another using a merge commit and only one conflict handling

git psykorebase {{upstream_branch}}

Continue after conflicts have been handled

git psykorebase --continue

Specify the branch to rebase

git psykorebase {{upstream_branch}} {{target_branch}}

Context

tldr-pages: common/git psykorebase

Revisions (0)

No revisions yet.