NWDI: Merge from two tracks

[Former Member]

Hello,

we have NWDI nw04s SP13 with two tracks. Track1 = Maintenancetrack. Track2 NewDevelopment. We tried to merge the two tracks, but we weren't successful. We decided to keep Track2 =NewDevelopment and redevelop the bug fixes from Track1 =Mainteancetrack, direct into Track2=NewDevelopment. We have done this. How does we get now all systems again on the same development level.

1) Creating a transport connection from Track2 to Track.

or

2) Transport all changes through Track2 until the software is assembled and then checkin the software in Track1, overwriting the old stuff.

Regards,

Alexander

[Former Member]

You should have set up a transport connection of type repair from track 1 to track 2.

There are multiple SDN blogs on this topic, I suggest you read those.

[Former Member]

Hello Pascal,

we have set up a a transport connection from track 1 to track2 . But the merge didn't work, because we had a lot of conflicts. Now we will set up a transport connection from track2 to track1.

Regards,

Alexander