All geek questions in one place

Git Flow - Sync two incomplete functions

We are working on one of our academic projects. The newly discovered Git thread is quite excited. But I have a problem that I will be glad if it can be clarified.

Our group, divided into two subgroups, works on several functions. We just found that we need one incomplete function to be used in another function. It really sounds crazy, but that’s the reason. I believe that we should have made more atomic objects, but they were made on all namespaces. Then I continued the temptation of coding and, with some luck in simplifying the turbo problem, increased our project side by completing our function ahead of the schedule. The only function left to work this semester depends on the product of group B.

Just to be clear:

  • Command A - Feature X, Feature Z (requires part of function Y)
  • Team B - Function Y
  • Command A starts function Z, command B has not finished function Y.

Can a team issue a B Feature Y team code to continue the project? Team B will update function Y on time, and team A will be able to receive updates if necessary.

Our current plan is to finish the current function in half, make the rest of the work work with more atomic functions and work on them. Then we (team A) hope to rebase and keep abreast of the latest developments.

Any suggestion other than a direct answer would be wonderful.

+4
source share
1 answer

Can a team perform code verification using the Team B Y function

If team B releases an intermediate version of Y , then team A can track Y from their own repo.
See this answer for an example :

 git flow feature track my-feature-branch

(based on git flow CLI and git flow track )

Once you track Y in your own repo team, A can merge or rebuild your work on top of Y

+3
source

Source: https://habr.com/ru/post/1480256/

More articles:


All Articles