I’m fairly new to Dataform, so perhaps I’m missing something. I have a repo in DF connected to a private GitHub repo. Our team has the workflow structured with a ‘dev’ workspace pushing to the dev remote branch, ‘uat’ workspace pulling from the uat branch (branch source is the dev branch), and the main/default branch is for production. We use PRs in the browser to merge commits from dev to uat and then uat to main.
What’s happening is that commits are getting out of sync. By the time our query from dev is merged into uat and then into main, the dev workspace tells us that we’re somehow X commits ahead of the remote branch and also X commits ahead of the default branch. But also Y commits behind the default branch.
From what I can tell, it’s due to the merge commits that are happening - each gets a new commit ids. Is there some way to streamline this so we’re not having to constantly merge merges from other branches? I don’t see a way to fast-forward merge via the browser. Or should we be deleting the dev and uat branches after each roll out to production?