From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Damon LaCrosse <arid@inbox.ru>
Cc: git@vger.kernel.org
Subject: Re: Possible git bug
Date: Sat, 17 Jan 2009 16:16:01 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.1.00.0901171613540.3586@pacific.mpi-cbg.de> (raw)
In-Reply-To: <87zlhqca4m.fsf@inbox.ru>
Hi,
On Sat, 17 Jan 2009, Damon LaCrosse wrote:
> any chances the attached patch reveals a git bug?
You mean that it produces a merge conflict when a file was modified in one
branch, and deleted in the other?
Because that's what you did, basically. You did not rename file1 to
file2. You completely changed the contents. I mean, completely.
Ciao,
Dscho
next prev parent reply other threads:[~2009-01-17 15:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-17 13:52 Possible git bug Damon LaCrosse
2009-01-17 15:16 ` Johannes Schindelin [this message]
2013-08-14 4:50 Hugh Davenport
2013-08-14 5:42 ` Daniel Knittl-Frank
2013-08-14 6:53 ` Jeff King
2021-09-16 3:29 Wesley Schwengle
2021-09-16 5:37 ` Taylor Blau
2021-09-16 12:07 ` Wesley Schwengle
2021-09-16 12:47 ` wesley
2021-09-16 15:33 ` Junio C Hamano
2021-09-16 19:39 ` Wesley Schwengle
2021-09-16 21:52 ` Junio C Hamano
2021-09-16 22:30 ` Wesley Schwengle
2021-09-16 21:21 [PATCH] Document `rebase.forkpoint` in rebase man page Junio C Hamano
2021-09-16 22:35 ` Possible git bug wesley
2021-09-16 22:46 ` wesley
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=alpine.DEB.1.00.0901171613540.3586@pacific.mpi-cbg.de \
--to=johannes.schindelin@gmx.de \
--cc=arid@inbox.ru \
--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).