Merge-NAVApplicationObject - best practise for max merge??

SteveKnott

Hi.. If I add fields to a table... then merge to a later CU... some tables merge ... others are conflicts... and the changes are just "Insertions" of fields.

Any tips / tricks as to why some tables merge file.. and others dont ?

Sample .CONFLICT below.. no idea why it couldn't merge that ?

OBJECT Modification "Job Journal Batch"(Table 237)
{
OBJECT-PROPERTIES
{
Date=08/09/16;
Time=09:41:10 PM;
Modified=Yes;
Version List=NAVW17.00;
}
PROPERTIES
{
Target="Job Journal Batch"(Table 237);
}
CHANGES
{
{ Insertion ;InsertAfter=Recurring(Field 22);
ChangedElements=FieldCollection
{
{ 50000; ;TimeSheet ;Boolean }
}
}
}
CODE
{

BEGIN
END.
}
}

Kishorm

Does the object (in this case Table 237) exist in all 3 sources you are trying to merge?

Kishorm

I think you may get the conflict as above if the object does not exist in the TargetPath

SteveKnott

Didn't think to check that... will do so..

Kishorm

@SteveKnott - was a missing source file the problem?

SteveKnott

Hi,

Sorry for long delay... the files did exist in all 3... eventually just did the conflicts manually...