CmdID

CmdID / Commands

git-imerge

Perform a merge or rebase between two Git branches incrementally. tldr-pages

On several platforms

Opens CmdID with your command. It is read in your browser and sent nowhere.

Several platforms

from tldr-pages, CC BY 4.0

Perform a merge or rebase between two Git branches incrementally. Conflicts between branches are tracked down to pairs of individual commits, to simplify conflict resolution.

Start imerge-based rebase (check out the branch to be rebased, first)

git imerge rebase branch_to_rebase_ontoIdentify

Start imerge-based merge (check out the branch to merge into, first)

git imerge merge branch_to_be_mergedIdentify

Show ASCII diagram of in-progress merge or rebase

git imerge diagramIdentify

Continue imerge operation after resolving conflicts (git add the conflicted files, first)

git imerge continue --no-editIdentify

Wrap up imerge operation, after all conflicts are resolved

git imerge finishIdentify

Abort imerge operation, and return to the previous branch

git imerge remove && git checkout previous_branchIdentify