Git workflows automat-it

© 2018 Automat-IT, All rights reserved www.automat-IT.com | Info@automat-IT.com
Automat-IT
University
Git workflows and features

What is Git
• Git is a distributed version control system. It means your local copy of code is a
complete version control repository. These fully-functional local repositories make it is
easy to work offline or remotely. You commit your work locally, and then sync your copy
of the repository with the copy on the server.
• The major difference between Git and any other VCS (Subversion and friends included)
is the way Git thinks about its data.
• Most other systems store information as a list of file-based changes.
• Git thinks of its data like a series of snapshots of a miniature filesystem. With Git, every
time you commit, or save the state of your project, Git basically takes a picture of what
all your files look like
2

3
Topics
● Important Git features
● Git workflows
● Pull requests
● Popular Git web based repository hosting services

4
Important Git features - clone/init
- git init - create new local repository in the current
directory
john@john-vm:/tmp/new_component$ git init
Initialized empty Git repository in /tmp/new_component/.git/
john@john-vm:/tmp/new_component$
- git clone - copy existing remote repository to local
computer
john@john-vm:/tmp$ git clone git@bitbucket.org:automatitdevops/countryinfo.git
Cloning into 'countryinfo'...
remote: Counting objects: 269, done.
remote: Compressing objects: 100% (237/237), done.
remote: Total 269 (delta 49), reused 189 (delta 17)
Receiving objects: 100% (269/269), 1.87 MiB | 962.00 KiB/s, done.
Resolving deltas: 100% (49/49), done.
john@john-vm:/tmp$

Important Git features - commit
Commit - set of changes under source control
john@john-vm:/tmp/countryinfo$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: currency.php
no changes added to commit (use "git add" and/or "git commit -a")
john@john-vm:/tmp/countryinfo$ git add currency.php
john@john-vm:/tmp/countryinfo$ git commit -m 'Remove new line'
[master f7c452e] Remove new line
1 file changed, 1 insertion(+), 2 deletions(-)
john@john-vm:/tmp/countryinfo$

Important Git features - push
Push - upload local commits to remote repository.
john@john-vm:/tmp/countryinfo$ git push
Counting objects: 3, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 306 bytes | 306.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0)
To bitbucket.org:automatitdevops/countryinfo.git
5ae168a..f7c452e master -> master
john@john-vm:/tmp/countryinfo$

Important Git features - pull
Pull - download commits from centralized repository.
john@john-vm:~/repos/countryinfo$ git pull
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 9 (delta 4), reused 0 (delta 0)
Unpacking objects: 100% (9/9), done.
From bitbucket.org:automatitdevops/countryinfo
547f0ca..f7c452e master -> origin/master
Updating 547f0ca..f7c452e
Fast-forward
codestyles/Default.xml | 1 +
currency.php | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
create mode 100644 codestyles/Default.xml
john@john-vm:~/repos/countryinfo$

Important Git features - Branch
Branch - ordered set of commits.
Create new branch:
john@john-vm:~/repos/countryinfo$ git checkout -b new_web_handler
Switched to a new branch 'new_web_handler'
List of all branches:
john@john-vm:~/repos/countryinfo$ git branch -a
master
new_cool_feature
* new_web_handler
remotes/origin/HEAD -> origin/master
remotes/origin/master
remotes/origin/new_cool_feature

Important Git features - Branch cont
Pushing new branch to upstream repository
john@john-vm:~/repos/countryinfo$ git push --set-upstream origin test_feature2
Counting objects: 3, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 303 bytes | 303.00 KiB/s, done.
remote:
remote: Create pull request for test_feature2:
remote: https://bitbucket.org/automatitdevops/countryinfo/pull-
requests/new?source=test_feature2&t=1
remote:
* [new branch] test_feature2 -> test_feature2
Branch test_feature2 set up to track remote branch test_feature2 from origin.

Important Git features - Merge
Merge - Join two or more branches together.
Checkout target branch:
john@john-vm:~/repos/countryinfo$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
Merge new_web_handler into master branch
john@john-vm:~/repos/countryinfo$ git merge new_web_handler
Updating f7c452e..403279d
Fast-forward
rest_api.php | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

Important Git features - Rebase
Rebase - apply commit (changes) to another commit.
john@john-vm:~/repos/countryinfo$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: delete unnecessary space from editor.xml

Important Git features - Cherrypick use case
Let’s take an example of the repo that has the master branch with the main
codebase and 3 integration branches for different Operating Systems.
Due to some reason we need to apply changes from C3 commit to Debian and
Centos branches and changes from C4 to Windows branch.
It can be done using Cherrypick.
Cherrypick apples ONLY changes and
creates NEW commit.

Important Git features - Cherrypick
Cherrypick - Copy one exact commit from one branch to another.
Initial changes on master:
john@john-vm:~/repos/countryinfo$ git log
commit 24158fe6242ce64a22dd280871c398ce446eaf4f (HEAD -> master)
Author: John Smith <John.Smith@automat-it.com>
Date: Mon Mar 26 10:53:10 2018 +0300
change currency.php
commit 47dee5dd546a88ce1eba6225010c3c9239d42931
Date: Mon Mar 26 10:52:34 2018 +0300
Change style.css

Important Git features - Cherrypick cont
Apply 47dee5dd546a88ce1eba6225010c3c9239d42931 on test_feature branch.
john@john-vm:~/repos/countryinfo$ git checkout test_feature2
Switched to branch 'test_feature2'
john@john-vm:~/repos/countryinfo$ git cherry-pick 47dee5dd546a88ce1eba6225010c3c9239d42931
[test_feature2 9f7e195] Change style.css
Date: Mon Mar 26 10:52:34 2018 +0300
1 file changed, 2 insertions(+), 1 deletion(-)
john@john-vm:~/repos/countryinfo$ git log
commit 9f7e19543467b491273178f789cce151ef14eda1 (HEAD -> test_feature2)
Date: Mon Mar 26 10:52:34 2018 +0300
Change style.css

Important Git features - Tags
Tags - An ability to specify labels on commits.
Apply tag v0.1_test on the latest commit
john@john-vm:~/repos/countryinfo$ git tag v0.1_test
Upload the tag to remote repo
john@john-vm:~/repos/countryinfo$ git push origin --tags
* [new tag] v0.1_test -> v0.1_test
Bitbucket view for tagging

Main Git workflows
● Centralized
● Feature branch
● Gitflow
● Forking

Centralized workflow
The main idea: all developers push changes into a single master branch.
Pros:
Minimum operations to deliver changes to master branch
Cons:
- A lot of merges (and merge conflicts).
- Master branch can have broken code.

Feature branch workflow
The main idea: all feature development should take place in a dedicated branch
instead of the master branch.

Feature branch workflow cont.
Pros:
- Only one merge per feature.
- Potentially master branch should have only stable and tested code.
Cons:
- Additional opperations to deliver changes to master branch.

Gitflow workflow
This workflow doesn’t add any new concepts or commands beyond what’s
required for the Feature Branch Workflow. Instead, it assigns very specific roles
to different branches and defines how and when they should interact.
Mandatory branches:
- Master - official release history, all commits are tagged.
- Develop - main branch to integrate features.
- Release - temporary branch to prepare release.
- Feature - branches for a features
- Hotfix - bugfixes for release

Gitflow workflow - develop branch

Gitflow workflow - release branch

Gitflow workflow - hotfix branch

Git-flow extension
git-flow are a set of git extensions to provide high-level repository operations
for Gitflow branching model.

Pull Requests
Pull requests are a feature that makes it easier for developers to collaborate.
Due to PR all merges can be reviewed and approved or declined.
● Pull requests can be used in conjunction with the Feature Branch Workflow,
the Gitflow Workflow, or the Forking Workflow.
● Pull request requires either two distinct branches or two distinct
repositories, so they will not work with the Centralized Workflow.

Pull request handling on Bitbucket
Create a pull request in order to
merge ‘new_cool_feature’ branch
to ‘master’

Pull request handling on Bitbucket cont
Approval and merge form
Merged commit

Git repositories hosting services
There are 2 most popular public Git repositories hosting services: GitHub and
Bitbucket
Both have great web UI to visualize changes, commits, branches, pull requests,
etc.
Also both can be integrated with third party systems like CI/CD tools.

Bitbucket branches and Pull requests UI
Branches GUI
Pull requests GUI

SourceTree - Git graphical client
SourceTree is a graphical clients for Git.
Main feature:
- No need to remember and execute command-line commands.
- Visualizing of local repository (changes, commits, branches, etc).
- Interactive visual rebase.
- Local commit search.
- Free of charge.

SourceTree - history window
SourceTree can visualize complicated branching history

Git workflows automat-it

Recommended

More Related Content

What's hot (20)

Similar to Git workflows automat-it (20)

Recently uploaded (20)

Git workflows automat-it