Issues with using the merge tool

[rmuller-vu]

What product would you like to leave feedback for?

Console

What Console version are you using?

v14.4.0

Description

Merge Tool Feedback:

We've encountered two significant issues with the merge tool that are impacting our workflow:

Issue 1: Merge Failures When Selecting Source/Target

When explicitly selecting which side to take (source or target), the tool sometimes fails to merge properly and produces incorrect results.

Examples:
We selected to merge left side

It merged leaving the same property twice

Issue 2: Unintended Deletion of New Files During Merge

Scenario: Multiple teams work in the same project.

1. A user creates a new revision from main, adds new configmap
2. develops on revision for a while
3. merges main into their branch to stay current.

Problem: The merge tool defaults to deleting newly added resources that don't exist in main (the merge source). This behavior is counterintuitive and easy to miss, leading to accidental deletion of intentionally added files.

Expected behavior: New files in the target branch should be preserved by default when merging into a revision.

Both issues pose risks to our multi-team workflow and would benefit from improved handling or clearer warnings.

[albertotessarotto]

Hello, thanks for feedback.
The upcoming v14.5.0 introduces a new interface for merging configurations available in Beta.
The new interface aims at addressing even the here reported issues.
You can find instructions on how to activate it for your project in our documentation: https://docs.mia-platform.eu/release-notes/v14.5.0#console---new-interface-for-configurations-merge

v14.5.0 will be generally available starting tomorrow evening.
We invite you to try it out and let us know if it improves your DevX. We look forward to your further feedback and ideas for improvement!
Thank you

[KarissaBrummell]

Thank you for letting us know! We'll try it and report back.

[KarissaBrummell]

Update: we have upgraded the console and are trialing the new merge tool changes. So far, we like it! Thank you all for implementing these fixes and modifications.

[rmuller-vu]

We have used the new merge tool for a couple weeks now. We like how the new one works.

There is one issue we have run into. If a revision has multiple NEW configmaps you can't just merge one and delete the other.

Microservice A has the new configmap I want to merge into main
Microservice B has a new configmap I do not want to merge into main

If I select Delete definitely on Microservice B configmap then Microservice A configmap also gets set to Delete definitely.

Expected:
I should be able to keep Microservice A configmap and delete Microservice B configmap during the merge so main will only have the configmap from Microservice A

[ThisIsDemetrio]

Hi @rmuller-vu

thanks for the heads-up. Unfortunately, we also noticed this behaviour, which is a simple but annoying frontend bug. The default selection is still the same, but the rendering show something different. We apologize on our end for this issue.

We are going to fix this issue in our next official release. I'll keep you updated on this thread.

Cheers,
|D|