Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to firstname.lastname@example.org.
> From: Tony Hoyle [mailto:tmh at nodomain.org] > > There is no way at all to do this automatically even if there *is* a > revision at the branchpoint. > > Let's say you have: (snip) > > How to you merge branch1 into branch2? It's impossible - you can't > know whether deleting the file is a valid action, so you do nothing, > and flag up a warning. Similarly you can't merge branch2 into > branch1. Ok, I agree that for that example you can't do it, but that's not the situation that I'm in. > For the deletion/addition to make any sense there must be no changes > at all to the target branch since the last common ancestor. This is > the only case where any kind of automatic delete/add works. Right! And that is exactly what I'm trying to do, but I can't get it to work! [Main] | 1.1--[Branch1] | (1.2)--[Branch2] I now want to merge Branch1 into Branch2. There have been no changes in either branch (in this file). What would you expect the result to be? Regards, Andy -- Andy Harrison - Platform Software Engineer Anite Telecoms Ltd. 127 Fleet Road, Fleet, Hampshire, GU51 3QN, UK "No matter how bad things seem... ...nothing could be worse than being used as a towel rail." - A.A. Milne Please note that my email domain has changed from @anitetelecoms.com to @anite.com Registered in England No. 1721900 Registered Office: 353 Buckingham Avenue, Slough, Berkshire SL1 4PF, United Kingdom Scanned for viruses by MessageLabs. The integrity and security of this message cannot be guaranteed. This email is intended for the named recipient only, and may contain confidential information and proprietary material. Any unauthorised use or disclosure is prohibited.