💾 Archived View for freeshell.de › tldr › git-imerge.gmi captured on 2022-06-11 at 21:51:47. Gemini links have been rewritten to link to archived content
⬅️ Previous capture (2022-04-28)
-=-=-=-=-=-=-
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.
git imerge rebase {branch_to_rebase_onto}
git imerge merge {branch_to_be_merged}
git imerge diagram
git imerge continue --no-edit
git imerge finish
git-imerge remove && git checkout {previous_branch}
Copyright © 2014—present the tldr-pages team and contributors.
This work is licensed under the Creative Commons Attribution 4.0 International License (CC-BY).