Managing e commerce systems codebase with git

Managing
E-commerce systems
codebase with Git
Bruno Ricardo Siqueira

About me
Bruno Ricardo Siqueira
Brazilian, working as Senior Software
Developer at Smartbox, ~10 years of
software development experience, PHP
evangelist, Git lover, Rock N' Roll fan,
Sci-fi addicted, MTG hobbyist player.
brunoric.info
linkedin.com/in/brunoric
twitter.com/brunoric
github.com/brunoric

● Motivation
○ Why your E-commerce system need a VCS?
○ Why Git?
● Git flows
○ Why use or create a flow?
○ Centralized workflow
○ Feature branch workflow
○ Gitflow workflow
○ Forking workflow
○ Dictator and lieutenants workflow
● Git features and tools
Agenda

Managing E-commerce systems codebase with Git
Motivation

Motivation
Why your E-commerce
system need a VCS?

Managing e commerce systems codebase with git

Motivation - Why your E-commerce system need a VCS?
Long-term change history
of every file

Traceability

Branching and merging

Conflict resolution

● Improve automation for daily tasks
● Avoid code loss
● Backup and restore strategy
● Prototyping
● Find when a specific bug or feature was introduced
● …
● Continuous integration and Continuous delivery

Motivation - Why Git?
“I'm an egotistical bastard, and I
name all my projects after
myself. First Linux, now git.”
- Linus Torvalds

Git Flows

Git Flows
Why use or create a flow?

Git Flows - Why use or create a flow?
● With Git, branching and merging is cheap
● Flows bring history consistency
● Provide a logical way of reading the history
● Facilitate automation
● Facilitate new joiners ramp up
● Avoid mistakes (unintended pushes, merges, unmerged branches, etc)
● ...

Git Flows
Centralized workflow

Git Flows - Centralized workflow
● Like Subversion with
benefits:
○ developers have their
own local repository
○ Git branches are
fail-safe
○ Merge process is
painless

git push origin master

error: failed to push some refs to '/path/to/repo.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.git push origin master

git pull --rebase origin master

git add <some-file>
git rebase --continue
git push origin master

Git Flows
Feature branch workflow

Git Flows - Feature branch workflow

Git Flows - Gitflow workflow
git clone ssh://user@host/path/to/repo.git
git checkout -b develop origin/develop
git checkout -b some-feature develop
git status
git add <some-file>
git commit

git pull origin develop
git checkout develop
git merge some-feature
git push
git branch -d some-feature

git checkout -b release-0.1 develop

git checkout master
git merge release-0.1
git push
git checkout develop
git merge release-0.1
git push
git branch -d release-0.1

Git Flows
Dictator and lieutenants
workflow

Git Flows - Dictator and lieutenants workflow

Git features and tools

git log
git log [<options>] [<revision range>] [[--] <path>…]

Git features and tools - git log

git cherry-pick [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
[-S[<keyid>]] <commit>…
git cherry-pick --continue
git cherry-pick --quit
git cherry-pick --abort
git cherry-pick

Git features and tools - git cherry-pick

git cherry-pick [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
[-S[<keyid>]] <commit>…
git cherry-pick --continue
git cherry-pick --quit
git cherry-pick --abort
git stash

Git features and tools - git stash

Git features and tools - git stash
git stash
git checkout another-branch
phpunit
… # do some changes ...
git stash [pop/apply]
… # do another changes ...
phpunit
… # fix test issues
git add -p
… # do more fixes
git add .

git bisect <subcommand> <options>
git bisect

Git features and tools - git bisect
git bisect start
git checkout BAD-POINT
git bisect bad
git checkout GOOD-POINT
git bisect good

Git features and tools - git bisect

What else?

Git features and tools - What else?
git revert [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>…
git revert --continue
git revert --quit
git revert --abort
git revert

git apply [--stat] [--numstat] [--summary] [--check] [--index] [--3way]
[--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
[--allow-binary-replacement | --binary] [--reject] [-z]
[-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
[--ignore-space-change | --ignore-whitespace]
[--whitespace=(nowarn|warn|fix|error|error-all)]
[--exclude=<path>] [--include=<path>] [--directory=<root>]
[--verbose] [--unsafe-paths] [<patch>…]
git apply

git hooks

Credits and reference

Git Flows - Credits and reference
● Tutorials, documentation and other presentations:
○ A successful Git branching model - Vincent Driessen:
http://nvie.com/posts/a-successful-git-branching-model
○ Atlassian Advanced Git Tutorials:
https://www.atlassian.com/git/tutorials/advanced-overview
○ Git - Distributed Workflows:
https://git-scm.com/book/it/v2/Distributed-Git-Distributed-Workflows
○ Git - Get Ready To Use It
http://www.slideshare.net/origamiaddict/git-get-ready-to-use-it
○ Git Tower:
https://www.git-tower.com/learn/git/ebook/en/command-line/appendix
/from-subversion-to-git

Git Flows - Credits and reference
● Flow images:
○ Atlassian: https://www.atlassian.com/git/tutorials
○ Git SCM: https://git-scm.com/book
● Linus Torvalds image:
http://news.softpedia.com/news/Linus-Torvalds-presents-a-new-software-ma
nagement-configuration-system-1421.shtml
● Git bisect images:
http://five.agency/cut-your-way-through-problems-with-git-bisect
https://www.effectiveperlprogramming.com/wp-content/uploads/bisect1.png
● Git stash GIF:
http://thecodinglove.com/post/151285532543/git-stash
● Git hook image:
http://www.slideshare.net/PolishedGeek/git-hooked-using-git-hooks-to-impro
ve-your-software-development-process

Thanks!

Managing e commerce systems codebase with git

More Related Content

What's hot (20)

Viewers also liked (8)

Similar to Managing e commerce systems codebase with git (20)

More from Bruno Ricardo Siqueira (6)

Recently uploaded (20)

Managing e commerce systems codebase with git

Editor's Notes