Run kitchen-merge-preview Again

The following message appears in the UI while performing a kitchen merge:

Kitchen {kitchen_name} has new changes since last kitchen-merge-preview. Please run kitchen-merge-preview again.

Details

Most child kitchens are temporary workspaces intended only for development work. When users complete that work, they can merge it into a parent kitchen.

Behind the scenes, a kitchen merge is a merge of version control branches. Safeguards are in place within the Automation system to ensure conflicts do not occur with a merge.

Potential cause

While resolving conflicts for a kitchen merge, new changes can be introduced in both the parent kitchen and child kitchen that cause another conflict.

When the merge is applied, the system alerts you to redo the kitchen merge preview process so you can resolve the new conflicts.

Solution

Follow the steps outlined in the Merge Kitchen document to resolve the merge conflicts.

Note

Still not working? Contact DataKitchen Support. We can work through this together.