From: Michael Harbeck <michael_harbeck@arcor.de>
To: git@vger.kernel.org
Subject: Question: Odd merging behaviour with copied/moved files
Date: Wed, 7 Oct 2009 08:52:43 +0000 (UTC) [thread overview]
Message-ID: <loom.20091007T104139-315@post.gmane.org> (raw)
Hello,
I'd just had the following situation:
A repository with a file: File1
A clone of this repository.
I made some changes to File1 in this repository and checked them in
Now someone decide to to rename and copy the File1 in the first repository and
checked those changes in. Now there is no File1 any more in the first repository.
After a while I pulled from this first repository. My changes are only merged in
one file! I think this behavior is strange.
In the second case its also strange, that if there is a copy in the first
repository, after a pull my changes in the copied file are also missing.
Is there a possibility to get warned about these situations, or better is there
an automatic way to merge my changes to both pulled files?
Thanks,
Michael
reply other threads:[~2009-10-07 9:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=loom.20091007T104139-315@post.gmane.org \
--to=michael_harbeck@arcor.de \
--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).