Цикл разработки приложения с использованием Git

Цикл разработки приложения с использованием Git

admin No Comment
Uncategorized

1.Get the latest version

$ git checkout develop

$ git pull

2.Make new branch for your task or bug, please use this template — «users/ALIAS/Bug(or Task)-NumberOfTheTask»

$ git checkout -b users/anbesp/Task-00001

3.Start development, commit your changes to your branch (‘users/anbesp/Task-00001’)

4.After your finished your Task or fixed your Bug, other developers could pushed a lot of code to develop branch, your need to get new version of ‘develop’ branch

$ git checkout develop

$ git pull

5.Make rebase

$ git checkout users/anbesp/Task-00001

$ git rebase develop

6.Resolve all (if have) conflicts

7.Make merge

$ git checkout develop

$ git pull

8.If ‘develop’ branch have new changes, go to 4 point, otherwise go to next point

9.Start merge with —squash, for squash previous commits into one, you should merge without any issues, otherwise go to 4 point

$ git merge —squash users/anbesp/Task-00001

10.Set commit message. Please use this template — «[Task(or Bug) NumberOfTheTask] Short description»

$ git commit -m «[Task 00001] Add translated strings»

11.Delete your local branch if need

$ git merge users/anbesp/Task-00001

12.Push your changes, you should push without any issues, otherwise go to 4 point

$ git push

 

Оставить ответ