0

I have checked several questions like: Gitflow with multiple master branches and What's best way to work with git on multiple master branch? but no one is similar with my situation.

In my case, we have 2 teams in different region for one repository. We have 2 parallel git flow system in our repository, A-dev/A-release/x.x and B-dev/B-release/x.x, due to some localization feature for different region. But A is our mother company's team, and they have more developers and higher release frequency. For now, our git flow is that, B team's developers will create a new branch from A-dev called B-dev as the base branch of B-release, and every PR to B-dev will also create a PR to A-dev, and it will be merged after A and B both approve this PR, but developers in team A just worked in standard git flow model. So A and B team's code synchronize every 2 weeks, but for some special reason it will be a longer period.

And now we meet a question that Team A have set up a Admin platform which our application depend on, we call it ADMIN and our application is APP. ADMIN only works for 2.2.3 APP but Team B's APP version is 2.2.1 because Team A hot fix a bug during the 2 weeks of synchronization gap and Team B don't know it. When team B deploy new ADMIN and APP the application crash down.

Our temporary solution is ask Team A work as Team B create PR to B-dev also when create PR to A-dev. But now team B is flowed by Team A's PR. We are thinking if we should create a share branch for this question.

Antonio Petricca
  • 6,313
  • 5
  • 28
  • 63
tingyu gu
  • 63
  • 7
  • 1
    you might want to use ```git tag``` to tag version, then deploy specific ADMIN version that's still compatible with your APP. – Kristian Aug 31 '21 at 08:15

0 Answers0