From 9ec2ca121b4ea50ada1e8f153ab80921f156d802 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Thu, 2 Jun 2022 06:06:44 +0300 Subject: [PATCH] Add TL;DR reminder --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index d44ffae..84b2b00 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,17 @@ Perform a merge between two branches incrementally. If conflicts are encountered, figure out exactly which pairs of commits conflict, and present the user with one pairwise conflict at a time for resolution. +# TL;DR + +```sh +git-imerge rebase main +git add path/with/resolved/conflict +git-imerge continue +git-imerge finish +``` + +# Documentation + `git-imerge` has two primary design goals: * Reduce the pain of resolving merge conflicts to its unavoidable minimum, by finding and presenting the smallest possible conflicts: those between the changes introduced by one commit from each branch.