From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] Keep rename/rename conflicts of intermediate merges while doing recursive merge
Date: Sat, 31 Mar 2007 14:06:58 +0200 [thread overview]
Message-ID: <eulimv$369$1@sea.gmane.org> (raw)
In-Reply-To: 20070331114938.GB4377@steel.home
Alex Riesen wrote:
> The result seem to be at least predictable. Still, doesn't it mean
> that once a rename/rename conflict is in it has to be resolved
> manually forever?
What about git-rerere2 idea (recording resolving of tree-level conflicts,
i.e. rename/rename and such)?
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2007-03-31 12:04 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-29 7:50 SEGV in git-merge recursive: Tom Prince
2007-03-29 8:18 ` Alex Riesen
2007-03-29 8:32 ` Tom Prince
2007-03-29 11:29 ` Alex Riesen
2007-03-29 12:58 ` Tom Prince
2007-03-29 13:34 ` Alex Riesen
2007-03-29 14:12 ` Tom Prince
2007-03-29 14:44 ` Alex Riesen
2007-03-29 14:45 ` Alex Riesen
2007-03-29 15:04 ` Tom Prince
2007-03-29 15:04 ` Alex Riesen
2007-03-29 18:32 ` Alex Riesen
2007-03-29 18:55 ` Alex Riesen
2007-03-29 23:01 ` [PATCH] An attempt to resolve a rename/rename conflict in recursive merge Alex Riesen
2007-03-29 23:13 ` Alex Riesen
2007-03-29 19:34 ` SEGV in git-merge recursive: Linus Torvalds
2007-03-29 19:40 ` Linus Torvalds
2007-03-29 20:44 ` Alex Riesen
2007-03-30 21:00 ` Johannes Schindelin
2007-03-31 0:35 ` Linus Torvalds
2007-03-31 1:03 ` Linus Torvalds
2007-03-31 10:49 ` Alex Riesen
2007-03-31 11:49 ` [PATCH] Keep rename/rename conflicts of intermediate merges while doing recursive merge Alex Riesen
2007-03-31 12:06 ` Jakub Narebski [this message]
2007-03-31 12:50 ` Johannes Schindelin
2007-03-31 12:53 ` Johannes Schindelin
2007-03-31 16:07 ` Linus Torvalds
2007-03-31 17:34 ` Alex Riesen
2007-03-31 20:03 ` Junio C Hamano
2007-03-31 11:22 ` SEGV in git-merge recursive: Johannes Schindelin
2007-03-29 19:55 ` Tom Prince
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='eulimv$369$1@sea.gmane.org' \
--to=jnareb@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).