Merge remote-tracking branch 'origin/feature/gitOpStyle' # Conflicts: # .vscode/launch.json # Makefile # cmd/apply.go # cmd/applyNamespace.go # cmd/delete.go # cmd/root.go # realm/namespaces/_defaults.yaml # realm/values/env/dev/default/values.yaml
Merge remote-tracking branch 'origin/feature/gitOpStyle' # Conflicts: # .vscode/launch.json # Makefile # cmd/apply.go # cmd/applyNamespace.go # cmd/delete.go # cmd/root.go # realm/namespaces/_defaults.yaml # realm/values/env/dev/default/values.yaml