[mailto:[EMAIL PROTECTED]]
Sent: Thursday, April 12, 2001 7:38 PM
To: Chen, Susie; [EMAIL PROTECTED]
Subject: Re: rename question -- urgent!!
- Original Message -
From: Chen, Susie [EMAIL PROTECTED]
I have two branches (A and B) off the HEAD. Both branches have a file
old.txt. What I have
David L. Martin writes:
The branch A change to old.txt will be disregarded in the merge to the trunk
since old.txt no longer exists there.
It won't be completely disreguarded: you'll get an error message telling
you that old.txt does not exist but is present on branch A.
-Larry Jones
I have two branches (A and B) off the HEAD. Both branches have a file
"old.txt". What I have done is:
1) On branch B, rename the file from old.txt to new.txt by
removing,adding and then committing
2) merge branch B into HEAD
Next I am planning to merge branch A into HEAD. But the filename in A
- Original Message -
From: "Chen, Susie" [EMAIL PROTECTED]
I have two branches (A and B) off the HEAD. Both branches have a file
"old.txt". What I have done is:
1) On branch B, rename the file from old.txt to new.txt by
removing,adding and then committing
2) merge branch B into
