include all lines with conflicts to output file

[cgfrosty]

Hi,

We do automerge for 2 json files.
We have 2 json files like these:

1.
"notifydialog_label_overwrite_caption":"Overwrite" ,
"notifydialog_label_overwrite":"Overwrite existing file?",
"notifydialog_label_ok":"Ok",
"notifydialog_label_cancel":"Cancel",
"Tour_Ice":"Ice Tour",
"user_object_ArmChair_003":"Arm-chair Task w/o arms",

2.
"notifydialog_label_overwrite_caption":"Overwrite" ,
"notifydialog_label_overwrite":"Overwrite existing file?",
"notifydialog_label_ok":"Ok",
"notifydialog_label_cancel":"Cancel",
"Tour_UgraArena":"UgraArena Tour",
"user_object_ArmChair_002":"Arm-chair Task w/ arms",

We need
"notifydialog_label_overwrite_caption":"Overwrite" ,
"notifydialog_label_overwrite":"Overwrite existing file?",
"notifydialog_label_ok":"Ok",
"notifydialog_label_cancel":"Cancel",
"Tour_Ice":"Ice Tour",
"user_object_ArmChair_003":"Arm-chair Task w/o arms",
"Tour_UgraArena":"UgraArena Tour",
"user_object_ArmChair_002":"Arm-chair Task w/ arms",

But receive
"notifydialog_label_overwrite_caption":"Overwrite" ,
"notifydialog_label_overwrite":"Overwrite existing file?",
"notifydialog_label_ok":"Ok",
"notifydialog_label_cancel":"Cancel",
"Tour_Ice":"Ice Tour",
"user_object_ArmChair_003":"Arm-chair Task w/o arms",

Could you help us to solve this task?

Thank you very much!

Alex

[Aaron]

Hello Alex,

Could you let us know the exact file input and command line you are using? In this test case, this two-way merge has a conflict. The command line would not provide an output without the /force command, which would include both left and right with conflict markers. If you could, please email us at [email protected] with:

- a pair of sample files
- a link back to this forum thread
- your BCSupport.zip from the Help menu -> Support; Export
- the command line you are currently using.

In the graphical interface, when you encounter the conflict you can use the Take Left then Right (or Right then Left) commands to take both lines into the output.