From: Ilya Kantor <iliakan@gmail.com>
To: git@vger.kernel.org
Subject: git rerere to remember half-merged progress - valid use?
Date: Sat, 10 Mar 2018 17:22:46 +0300 [thread overview]
Message-ID: <CAFU8umhtBxs9X+f1p3k8D6a4mue6OvM9cydrK-cRW8Nsq8Vcww@mail.gmail.com> (raw)
Hi,
Let's say I'm merging a branch with many conflicts.
I resolved some of them, but then can't proceed or need to switch elsewhere.
Will it be a good practice to call `git rerere` to remember resolved
conflicts, so that in the future
when I re-merge, I get my half-done merge back?
I couldn't find such use of rerere in the internet.
How can I save the merge/restore progress otherwise?
---
Best Regards,
Ilya Kantor
next reply other threads:[~2018-03-10 14:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-10 14:22 Ilya Kantor [this message]
2018-03-11 0:00 ` git rerere to remember half-merged progress - valid use? Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAFU8umhtBxs9X+f1p3k8D6a4mue6OvM9cydrK-cRW8Nsq8Vcww@mail.gmail.com \
--to=iliakan@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.