Jump to content


Git flow and syncing of feature branches

git perforce

  • Please log in to reply
No replies to this topic

#1 andrewd43

andrewd43

    Newbie

  • Members
  • Pip
  • 1 posts
  • LocationBangalore

Posted 21 August 2020 - 06:30 AM

I am coming from Perforce, so please excuse my beginner question. I am evaluating git and its integration model. In Perforce I have a master and a develop branch. feature1 and feature2 are branched of develop - so similar to git flow, except that changes in master go back into the feature branches, so a circular integration model.
master-------+-----+
⬆		 |	 |
+-develop |	 |
	 ⬆		 ⬇	 |
	 +-----feature1-+ |
	 ⬆			 ⬇
	 +------------feature2

That solves one big problem in our C++ pipeline. Someone merges his features into develop and let's assume there is a compiler error due to an incorrectly resolved conflict, etc. (developers simply can't resolve all issues locally because of 8 different targets). So they submit it, compile it on the build server and fix any issues that are left. Only if develop compiles on all platforms, the changes will be merged into master. So it's like a safety branch so nothing broken ends up in master. With this solution every developer can be assured that any integrate from master into his feature branch is clean and works.
Now my question, how is this achieved with git flow? How are features coming from one feature branch into another without any problems?





Also tagged with one or more of these keywords: git, perforce

0 user(s) are reading this topic

0 members, 0 guests, 0 anonymous users