You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Resolve conflicts by keeping main branch changes for dev environment:
- Use updated README.md from main with dev environment clarifications
- Keep dev/values.yaml configurations from main
- Retain prod/values.yaml for production environment with proper prod settings
Signed-off-by: Tibor Kircsi <tkircsi@cisco.com>
0 commit comments