I am using 3 way compare for the following files. But when i merge these 3 code files it merged in wrong order.
Original File:
'*************** CHANGE SET 1 ***************
'*************** CHANGE SET 2 ***************
CODE TO BE MERGED ( THIS WORKSPACE WAS CREATED BEFORE INCORPORATING CHANGE SET 2)
Merge result :
Error:
Code line 'x = 1' should not have been merged with sub b()
How to merge code procedure wise ? (i.e code from one sub should not be merged with other sub)
Please let me know if any settings available for proper merging of vb code procedure wise.
Original File:
'*************** CHANGE SET 1 ***************
Code:
Public Class Form1 Private Sub Form1_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load End Sub Private Sub a() Dim a As String Dim b As String a = 1 a = 1 b = 1 b = 1 b = 1 End Sub End Class
Code:
Public Class Form1 Private Sub Form1_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load End Sub Private Sub a() Dim a As String Dim b As String Dim x As String Dim y As String a = 1 a = 1 x = 1 b = 1 b = 1 b = 1 End Sub End Class
Code:
Public Class Form1 Private Sub Form1_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load End Sub Private Sub a() Dim a As String Dim b As String ' a = 1 ' a = 1 ' b = 1 ' b = 1 ' b = 1 ' c = 1 ' c = 1 End Sub Private Sub b() Dim a As String Dim b As String a = 1 a = 1 End Sub End Class
Code:
Private Sub a() Dim a As String Dim b As String Dim x As String Dim y As String ' a = 1 ' a = 1 ' b = 1 ' b = 1 ' b = 1 ' c = 1 ' c = 1 End Sub Private Sub b() Dim a As String Dim b As String Dim c As String a = 1 a = 1 x = 1 End Sub
Code line 'x = 1' should not have been merged with sub b()
How to merge code procedure wise ? (i.e code from one sub should not be merged with other sub)
Please let me know if any settings available for proper merging of vb code procedure wise.
Comment