OpenYearRount 11th session

1. Git
Branch
Strategy
Ki Hoon You

2. Add
Commit
Stash

3. Unmodified Modified Staged Saved

4. Add
Unmodified Modified Staged Saved

5. Commit
Unmodified Modified Staged Saved

6. Stash
Unmodified Modified Staged Saved

7. Stash

8. Team
Project

9. Gromit Penguin

10. Review
Inquiry
Wallace

11. main : project to deploy
dev : development project
main
dev

12. feature/gromit
feature/penguin
main
dev
feature/gromit
feature/penguin

13. Upload it to Github using a command
such as "git push -u origin feature/gromit".
origin/
main
origin/feature/gromit
origin/feature/penguin
origin/
dev

14. Project packages are divided into
modules.

15. feature/gromit
feature/gromit
feature
/review
feature/review

16. Gromit has completed the
implementation of all review features
and proceeded to merge the review
branch into their own and dev branch.
feature/gromit
feature
/review
feature
/review
feature
/review
feature
/review
dev dev
feature/gromit

17. feature/gromit
feature
/review
feature
/review
feature
/review
feature/penguin
feature
/review
dev dev
feature/gromit
origin
/dev
origin
/dev
git pull
If penguin first merged to dev and then pushed to
origin/dev, then gromit must pull origin/dev before
merging feature/gromit to the dev branch.
dev

18. The evil team leader, wallace, found out
that Gromit had implemented the review
function, and asked him to implement
the notice function immediately.
feature/gromit
feature
/notice

19. Hey gromit, I implemented
login function and pushed
it to origin/dev
Gromit, which needed a login function,
decided to stop implementing the notice
function and bring the login function to
the local branch.

20. Gromit stores the code he writes in the
staging area. Because he can't move a
branch with modified code in it.
Unmodified Modified Staged Saved
git stash git checkout dev git pull

21. Modified
Gromit made the login feature made by
Penguin available in the feature/notice
branch.
Unmodified Staged Saved
git checkout feature/gromit
git checkout feature/notice
git pull dev
git pull feature/gromit
git stash apply

22. Git commit message
convention

23. Git branch naming
feature
master
(main)