How, working alone on a project, simulate team development on git?
ps never worked in a team, but you need to prepare for such work

  • one
    project clone into two different folders (or two different computers). Then make changes on one machine and on the other. to commit Then on one push, and on the other go through pull-push / - KoVadim
  • @KoVadim can invent several roles, such as: manager, frontender, backender and from each of them to produce branches and carry out actions? - buyboy
  • In general, the manager (unless it is not a programm manager) has nothing to do in the gita. But if you like role-playing games, go ahead. - KoVadim
  • @KoVadim well, not a manager, but a teamlead (progmanager) - someone checking all + some virtual developers are needed - buyboy
  • one
    The most important thing is to be able to cut several features in parallel in different branches, and then merge the branches into develop, and develop into master, the rest is details. This and the development alone will not be superfluous - andreymal

1 answer 1

if you work in a team - do not push in the master, everything is on the branch, you need to be able to do the master / branch race,

  • I think it’s more important to learn how to solve conflicts, at least - lexxl
  • maybe there is some popular set of commands / actions in team development? it is clear that you will need experience rebase and work with conflicts - buyboy
  • one
    @lexxl conflicts are easy to solve through IDE - Bohdan Korinnyi
  • one
    @buyboy rebase , cherry-pick , squash (I personally do through git tortoise), pull , push , push -f - Bohdan Korinnyi
  • one
    @buyboy in IDE clearly shows where the conflict is and what needs to be done so that it doesn’t exist in IDE Intllij IDEA like this - Bohdan Korinnyi