When we deployed today, we had some merge conflicts we had to resolve between development and master. The root cause of this issue was that hotfixes only get applied to master. If we apply a hotfix to both development and master we can avoid this issue.
Ideally we can have two PRs created when we type hotfix into the code tool.
When we deployed today, we had some merge conflicts we had to resolve between development and master. The root cause of this issue was that hotfixes only get applied to master. If we apply a hotfix to both development and master we can avoid this issue.
Ideally we can have two PRs created when we type hotfix into the code tool.