NWDI: Merge from two tracks
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.
2) Transport all changes through Track2 until the software is assembled and then checkin the software in Track1, overwriting the old stuff.