* Question: Odd merging behaviour with copied/moved files
@ 2009-10-07 8:52 Michael Harbeck
0 siblings, 0 replies; only message in thread
From: Michael Harbeck @ 2009-10-07 8:52 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-10-07 9:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-07 8:52 Question: Odd merging behaviour with copied/moved files Michael Harbeck
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).