Eric Siegerman wrote:
On Wed, Jun 21, 2000 at 09:32:03AM +1000, Brian Collins wrote:
OK, so, if on the branch the change had looked like this:
Line 2 on the branch
Line 2A
and on the trunk it had looked like this:
Line 2 on the trunk
Line 2A
then adding "Line 3" on
Larry Jones wrote:
Brian Collins writes:
So, back to the branch, add another line (Line 3), commit it and merge it back
to the trunk as above. This gives conflicts, thus:
Line 1
f1
Line 2 on the trunk
===
Line 2 on the branch
Line 3
1.1.2.2
when
On Wed, Jun 21, 2000 at 09:32:03AM +1000, Brian Collins wrote:
OK, so, if on the branch the change had looked like this:
Line 2 on the branch
Line 2A
and on the trunk it had looked like this:
Line 2 on the trunk
Line 2A
then adding "Line 3" on the branch after "Line 2A" would
