From: Christoph Duelli <duelli@melosgmbh•de>
To: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Cc: git@vger•kernel.org
Subject: Re: git mv + git pull issue
Date: Mon, 09 Jun 2008 10:45:12 +0200 [thread overview]
Message-ID: <484CED98.3070506@melosgmbh.de> (raw)
In-Reply-To: <alpine.DEB.1.00.0806061639390.1783@racer>
Johannes Schindelin schrieb:
> Hi,
>
> On Fri, 6 Jun 2008, Christoph Duelli wrote:
>
>> cd ../gitmv
>> git mv afile newname
>> # do not commit
>> # now: afile is not in the directory anymore
>> # oh, I need those changes my colleague made...
>> git pull ../gitmv-clone/
>> # now: both(!) afile and newname are in the directory
>
> What is so surprising there? We _always_ recommend to commit before
> pulling.
Well, when I modify a file, and pull afterwards: my 'modification' is
never lost (the pull might fail, though).
If we consider the removal of a file as a kind of modification, one
would expect a similar behaviour.
I do agree that this is not (nec.) a bug, still I thought it worthwhile
to bring the matter up.
In our repository we get duplicates now and then because of it.
Regards
--
Christoph Duelli
prev parent reply other threads:[~2008-06-09 8:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-06 7:57 git mv + git pull issue Christoph Duelli
2008-06-06 15:40 ` Johannes Schindelin
2008-06-09 8:45 ` Christoph Duelli [this message]
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=484CED98.3070506@melosgmbh.de \
--to=duelli@melosgmbh$(echo .)de \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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