RE: Lines duplicated in dest. file when merging back to trunk

2013-06-04 Thread Saffer, Simon
Hi, I'm resending this email, now hopefully in plain text. Sorry about that. I’m not subscribed on your mailing list so it would be great if you could Cc me in your responses. I’m having problems with merges going wrong. In our company we sometimes put the same changes on several branches by h

Lines duplicated in dest. file when merging back to trunk

2013-06-04 Thread Saffer, Simon
Hi, I'm not subscribed on your mailing list so it would be great if you could Cc me in you responses. I'm having problems with merges going wrong. In our company we sometimes put the same changes on several branches by hand (the reason for this involves code that has to talk to a legacy system