Conflict management during template import

As a user, conflict management is facilitated during template import

AC
During template import

• If a conflict happens, a warning is shown
  • We can detect conflicts in I18N files (properties and JSON) and do a merge
  • We override other elements
  • We can detect conflicts in Registries and do a merge
  • We can do a merge of the AppDef
  • We remove .gitkeep files from the Studio template import (or any .* files)*
  • For other features, we only detect if the files exist or not

"This template conflicts with your existing configuration and is not imported yet." Two options are available:

• • cancel import with a "cancel import" button:
    • tag and branch are deleted and the previous branch (master if we can't detect) is checked out
  • force import with a "force import" button

• Analytics event is sent when pressing the cancel import button
  • Category: Described according to NXS-5742
  • Event: Template import cancel
  • Label: [Template title]
    (goal: learn how much of a dealbreaker conflict is)

• Analytics event is sent when pressing the force import button
  • Category: Described according to NXS-5742
  • Event: Template import forced
  • Label: [Template title]
    (goal: learn how much of a dealbreaker conflict is)