I am trying to design a Git workflow based on GitLab Flow as described in this document: https://docs.gitlab.com/ee/topics/gitlab_flow.html
I am using GitLab (of course) and I have a pipeline setup where:
masterbranch deploys to staging
productionbranch deploys to production
When I am ready to deploy, I create a merge request from
master > production.
My issue is that after a while, I start to see conflicts in these merge requests which need to be manually resolved before merging to
What is the correct way to update a
production branch for GitLab flow? It seems strange that I would have to manually fix conflicts to release to
production. I never push changes to
production directly, everything goes via
master so I’m not sure why I get conflicts.
Am I doing something wrong?