On Tue, 04 Jun 2013 14:09:35 +, Saffer, Simon wrote:
...
>
> A
> B
>
>some change
>
>some change
>
> C
> D
>
> We get no merge conflict, but the text is copied twice into the file on trunk.
So, you add one line on trunk, and a different line (and different
whitespace miea
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
On 06/04/2013 09:16 AM, Saffer, Simon wrote:
> I’m not subscribed on your mailing list so it would be great if you could Cc
> me in you responses.
HTML is a really poor format for emails sent to software discussion lists,
*especially* when the contents of the mail rely so heavily on formatting
det
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
