GIT workflow discussion for data products

[soraia653]

Select Topic Area

Question

Body

Hello everyone!

I'm designing my company's GIT workflow + release management and I have the following process:

4 "long-lived" env branches:

• dev
• tst
• uat
• main

The process for a new feature:

1. Create a new branch

git checkout main
git pull --rebase origin main
git checkout -b <branch-name>

2. Commit changes locally

git add -A
git commit -m "message"

3. Deploy changes to ENV branch

git checkout <branch-name>
git pull --rebase origin main
git checkout <ENV-branch>
git pull --rebase origin <ENV-branch>
git merge <branch-name>
git push origin <ENV-branch>

4. Create a release branch

git checkout main
git pull --rebase origin main 
git checkout -b release/<release-version>

5. Merge features into release branch

git checkout release/<release-version>
git pull --rebase origin release/<release-version>
git merge <branch-name>
git push origin release/<release-version>

6. Deploy to main

git checkout main
git pull --rebase origin main
git merge release/<release-version>
git push origin main

After I showed to my boss, he said he always wants to have UAT being merge to MAIN. However, in the way I designed I always had the assumption that we should never merge an ENV branch to another ENV branch because of potential conflicts.

He also doesn't like the use of git pull --rebase and doesn't understand the benefit.

What do you guys think? I'm afraid that if I start merging UAT to MAIN it will result in conflicts and the repos will become a mess.

I'm not so well-versed in Git/GitHub so I apologize for the trouble!