Dipresentasikan oleh Yudhi Satrio di DILo Surabaya bersama dengan komunitas Surabaya Dev pada tanggal 7 Februari 2017

1. Gitflow
by isatrio

2. An ordinary Front End Developer who like share knowledge. "I'm
not smarter than you, I'm just know first than you. If you find
something wrong, please tell me and we will fix it together."

3. Asumption
Repo is abbreviation of Repository
Pull is a command to get latest version of code
Push is a command to post our latest version of code
Branch is our own develop environment based on feature or
whatever we will doing
Commit is a command to tell git that we have done with our
own feature
Merge is a command to merge our work to whatever branch
we want
I use terminal only not using GUI

4. Collaboration
Developer have Back end, Front end, and whatever job title out
there. Every parts of job needs to organize well.
By manual, we will copy our work files to another team
Also syncronize it or just rewrite the file on local
If we have different code, we need to analyze it first before
rewrite.

5. Version Control
Version control is the management of changes to documents,
computer programs, large web sites, and other collections of
information.
Some of Version Control software:
SVN (Subversion)
Mercurial
Git

6. Git
Git is a version control system (VCS) software for tracking changes
in computer files and coordinating work on those files among
multiple people. With git, every person in project have their own
copy files at their local.
Some example of Git Providers are Github, Bitbucket, Gitlab, VSTS

7. How many workflows git have?
Centralized
Feature Branch
Gitflow
Fork

8. Centralized
Centralized just have one branch, "Master". Everytime create a
feature, we just create it at master branch.

9. Example
Jono start his works on his feature

10. Example
Putri start her works on her feature

11. Example
Jono publish his feature on master

12. Example
Putri publish her featuer on master, but she has a problem. Her
feature was conflicts with Jono's feature. Bejo want to be a hero, he
help Putri to fix the conflicts.

13. Example
Bejo help Putri to pull the latest version of master and rebase local
version for her.

14. Example
Rebase succeed, Putri can publish her feature on master cause of
Bejo. And then Putri hate Jono forever. Finally Bejo and Putri live
happily ever after.

15. Managing Conficts
This is a diagram of managing conflicts from Jono and Putri in
example above.

16. Feature Branch
Feature branch is a more safer and minimum conflicts instead
Centralized. Every person have their own branch to do the feature.
You can see below, Blue one is a master, the purple and green is a
branch.

17. Example
Putri start works on her feature

18. Example
Putri finish her feature and publish it on master and create pull
request to tell the team that she has done with her feature.

19. Example
Jono recieve the pull request from putri and merge on his feature

20. Gitflow
Gitflow workflow derived from Vincent Driessen at nvie. You can
download gitflow here https://github.com/nvie/gitflow.

21. Gitflow Branch
master is primary repo for production only
hotfixes is for fix feature that have realeased on master
realease is for realease a finish feature from develop
develop is a secondary repo for development stage, it will be
deploy in staging
feature is a branch to do feature from backlog

22. Gitflow manually
Since Gitflow have 2 branches we need to create one more called
develop
git checkout ­b develop master
Explaination, we move to develop branch with command
"checkout". "­b" is an option to create a new branch if the branch
not exist. In a fourth section "develop" is a name of branch we want
to create. The last, "master" is base of branch we want to clone to
our branch.

23. Gitflow Feature
If we want to works on our feature we need to tell git to create once
more branch. Called "feature/feature­name". and when if we finish,
we merge on develop branch. You can follow command below
// create new branch
git checkout ­b feature/feature­name develop
// merge feature done
git checkout develop
git merge feature/feature­name
git branch ­d feature/feature­name

24. Gitflow Release
When the feature finish and no bugs on develop stage, then we
release feature to master. you can see below
// create new branch
git checkout ­b release/release­name develop
// merge release done
git checkout master
git merge release/release­name
git checkout develop
git merge release/release­name
git branch ­d release/release­name

25. Gitflow Hotfixes
Hotfixes is very similar with release but it clone from master.
// create new branch
git checkout ­b hotfix/hotfix­name master
// merge hotfix done
git checkout master
git merge hotfix/hotfix­name
git checkout develop
git merge hotfix/hotfix­name
git branch ­d hotfix/hotfix­name

26. Gitflow itself
There are the illustration of gitflow by manual. Fortunately, Gitflow
have a plugin for to make our life easier. I will attach the command
below. If you first clone from repo, you should run init, "­d" is to
make gitflow use default option, if not include "­d" you will prompted
to write what is your default name of gitflow.
git flow init [­d]
git flow feature
git flow feature start <name> [<base>]
git flow feature finish <name>
git flow release
git flow release start <release> [<base>]
git flow release finish <release>
git flow hotfix
git flow hotfix start <release> [<base>]
git flow hotfix finish <release>

27. Resources
Change issue tracker bitbucket using Kanban style Bucket
Board
Gitflow https://github.com/nvie/gitflow
Compare workflow
https://www.atlassian.com/git/tutorials/comparing­workflows
Oh Sh*t git shitgit.com