dimanche 11 octobre 2015

Git Feature branch commits resulting into conflict issues

We have a working environment that is deployed on AWS(Amazon Web services) and is connected to Bitbucket. We have two branches one is LIVE and another one is BETA.

Previously we were developing creating feature branches on BETA and the after the feature completion we used to merge those changes into LIVE manually. But recently we thought about another process by creating feature branches on LIVE and then pull those into BETA. After completion we deploy the that feature Branch into LIVE. But that is resulting into Many code conflicts each time we pull a branch to BETA.

Here is the new flow that we are following :

Please note that LIVE and BETA both are not same in the code they have different set of codes. And we can not pull a branch into LIVE until is completely developed and tested by the QA team.

  1. git checkout LIVE
  2. git checkout -b A53-FullTestofGITCommands-LIVE

    MAKE CHANGES TO CODE

  3. git add . --all
  4. git commit -m'A53: This commit is used to test the GIT Commands'
  5. git push origin A53-FullTestofGITCommands-LIVE
  6. git checkout LIVE (NOTICE HERE we are not pushing the Changes to LIVE branch yet)
  7. git pull origin BETA
  8. git pull origin A53-FullTestofGITCommands-LIVE (We get code conflicts here, which we solve manually)
  9. git pull origin BETA
  10. git push origin BETA
  11. git aws.push

We are facing lot of code conflicts each time we pull a branch into BETA. We have multiple developers working on the very same branches.

As per what I noticed that issue could be because:

We are creating branches from LIVE and then pull them into BETA but we are never pulling those back into LIVE.

Kindly Let me know what could be the possible way-out to get this problem sorted out? Or if you refer us a better GIT flow that would be great too.




Aucun commentaire:

Enregistrer un commentaire