Visualizing Git Workflows - scribestools.readthedocs.io · eScribis...

19
eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows ... rw rw r w pr fk fk Trees Commits Branches Repositories Workflows ... rw rw r w pr fk fk Trees Commits Branches Repositories Workflows

Transcript of Visualizing Git Workflows - scribestools.readthedocs.io · eScribis...

Page 1: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 1

Visualizing Git Workflows

...

rwrwr

w

pr

fk

fk

Trees Commits Branches Repositories Workflows

...

rwrwr

w

pr

fk

fk

Trees Commits Branches Repositories Workflows

Page 2: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 2

...

rwrwr

w

pr

fk

fk

Trees Commits Branches Repositories Workflows

...

rwrwr

w

pr

fk

fk

Trees Commits Branches Repositories Workflows

Page 3: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 3

Workflows

Workflow = best practices + tools

init repoweb: new repogit clone https://github.com/...

init repoweb: new repogit clone https://github.com/...

pullgit pull root master

pullgit pull root master

new commit<changes>

git statusgit add -A :/git statusgit commit -am “<msg>”

new commit<changes>

git statusgit add -A :/git statusgit commit -am “<msg>”

(merge)git status<solve conflicts>

git statusgit add -A :/git commit -am “<msg>”

(merge)git status<solve conflicts>

git statusgit add -A :/git commit -am “<msg>”

pushgit push root master

pushgit push root master

no conflict merge conflict

Page 4: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 5

Choosing/Defining a workflow

- how many people ?- how fast ?- trust/skill levels ?- geographical distribution ?- high/low ceremonies ?- tool integrations ?- acceptable complexity ?- product quality factors ?- dev / maintenance ?- ...

??

Page 5: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 6

Workflows elements

- repositories- branches- merge/pull request- reviews- issues/boards- testing - continuous integration- releases

repositories

branches

reviews

pull request

Page 6: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

7eScribis GestionDeProduits-GitWorkflows-6 7

Workflows

Page 7: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 8

Some workflows

"Private workflow" "Centralized workflows" "Feature-branch workflows" "Rebase worflow" "Hashrocket workflow" "Star wars spring workflow" "Whispering pines workflow"

"Gitflow" "GitHub flow" "GitLab flow" "Atlassian Simple Git Workflow" "Forking workflows"

...

Page 8: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 9

Private workflow

initinit

CommitCommit

master

=> https://scribestools.readthedocs.io/en/latest/github/index.html#private-workflow

Page 9: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 10

Public workflow

CloneClone

CommitCommit

PushPush

w

origin/master

noe/master

=> https://scribestools.readthedocs.io/en/latest/github/index.html#public-workflow

Page 10: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 11

Shared master workflow

CloneClone

CommitCommit

PushPush

PullPull

...

rwrw

origin/master

noe/master

ali/master

=> https://scribestools.readthedocs.io/en/latest/github/index.html#shared-master-workflow

Page 11: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 12

Feature branches workflow

CloneClone

CommitCommit

PushPush

PullPull

BranchBranch

CheckoutCheckout

MergeMerge...

rw rw

master

feature24

feature23

feature25

=> https://scribestools.readthedocs.io/en/latest/github/index.html#feature-branches-workflow

Page 12: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 13

Git flowCloneClone

CommitCommit

PushPush

PullPull

BranchBranch

CheckoutCheckout

MergeMerge...

rw rw

master

features

develop

hotfixesreleases

=> https://scribestools.readthedocs.io/en/latest/github/index.html#git-flow

Page 13: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 14

Page 14: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 15

Open source workflows

...

rwrwr

w

pr

fk

fk

Integration manager workflow

w

pr

pr

Benevolent dictator workflow

Page 15: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 16

Pull-requests / Github flow

...

rwrwr

w

pr

fk

fk

fk

ForkFork

Commit Commit

PushPush

PullPull

Pull requestPull request

DiscussDiscuss

Ask reviewAsk review

BranchBranch

Commit Commit

RemoteRemote

Discuss Discuss

MergeMerge

ReviewReview

FetchFetch

deve

lope

r w

orkf

low

inte

grat

or w

orkf

low

Page 16: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 17

https://cloud.githubusercontent.com/assets/391331/6142393/72c7ff64-b16a-11e4-9e74-5b3c468ea791.png

Pull-requests -- Overview

Page 17: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 18

Review

Tests

Commit

Discussions

Commit

Pull-requests -- Example

Page 18: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 19

Pull-requests -- Reviews

Page 19: Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

eScribis GestionDeProduits-GitWorkflows-6 20

Pull-requests -- Merge


Git J Club Dm Git

Git J Club Dm Git

COPERTINA ACCIAIO 01 Layout 1 - Praim Srl€¦ · m/Kg BESTRAP® R70 (UNI EN 13246 type 1) BESTRAP® ACCIAIO / STEEL RW RW RW RW RW RW RW RW RW RW RW RW RW RW RW RW RW ± 0,035 mm

COPERTINA ACCIAIO 01 Layout 1 - Praim Srl€¦ · m/Kg BESTRAP® R70 (UNI EN 13246 type 1) BESTRAP® ACCIAIO / STEEL RW RW RW RW RW RW RW RW RW RW RW RW RW RW RW RW RW ± 0,035 mm

Git it on (includes git hub)

Git it on (includes git hub)

Git, smart git & gitflow

Git, smart git & gitflow

Git Down, Git On Up: Practical Examples of Intermediate Git Techniques

Git Down, Git On Up: Practical Examples of Intermediate Git Techniques

22.10.2010 SVN Accounts [NPFL094:/] … vojtech.diatka = rw ejemr = rw machacekmatous = rw sedlak = rw masekj = rw.

22.10.2010 SVN Accounts [NPFL094:/] … vojtech.diatka = rw ejemr = rw machacekmatous = rw sedlak = rw masekj = rw.

Wilo-EMU FA + FK 17.1, FK 202, FK 34, FK 42 · Pioneering for You · Wilo-EMU FA + FK 17.1, FK 202, FK 34, FK 42 6074704 • Ed.02/2017-06 es Instrucciones de instalación y funcionamiento

Wilo-EMU FA + FK 17.1, FK 202, FK 34, FK 42 · Pioneering for You · Wilo-EMU FA + FK 17.1, FK 202, FK 34, FK 42 6074704 • Ed.02/2017-06 es Instrucciones de instalación y funcionamiento

A brief introduction to git & GitHubkbroman/presentations/Git...git clone git@github.com:username/repo Change things locally, git add, git commit Push your changes to your GitHub repository

A brief introduction to git & GitHubkbroman/presentations/Git...git clone [email protected]:username/repo Change things locally, git add, git commit Push your changes to your GitHub repository

Tech Sheet: FK-Lightplanes FK-14 Polaris - Aircraft Covers

Tech Sheet: FK-Lightplanes FK-14 Polaris - Aircraft Covers

Git Tricks — git utilities that make life git easier

Git Tricks — git utilities that make life git easier

Git Started With Git

Git Started With Git

DATE WORKING DRAFT · agency under creative commons 3.0 new zealand (by) rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw

DATE WORKING DRAFT · agency under creative commons 3.0 new zealand (by) rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw rw

FOLLOW ALONG WITH THE EXAMPLES…€¦ · ( or "git pull" if you cloned at last session…) $ git checkout tags/session2 $ ls -l total 8 -rw-r--r-- 1 frey staff 670B Apr 21 15:23

FOLLOW ALONG WITH THE EXAMPLES…€¦ · ( or "git pull" if you cloned at last session…) $ git checkout tags/session2 $ ls -l total 8 -rw-r--r-- 1 frey staff 670B Apr 21 15:23

Git Best Practices - MariaDB.org...$ git push Write a good commit message! Regular git workflow $ git checkout bb-10.2-bug $ # Code, build, test... $ git add . $ git commit $ git push

Git Best Practices - MariaDB.org...$ git push Write a good commit message! Regular git workflow $ git checkout bb-10.2-bug $ # Code, build, test... $ git add . $ git commit $ git push

ClickShare Management Suiteessedisrl.eu/wp-content/uploads/2015/04/files_CSManagement_Suite.p… · Scheduler RW RW User management RW R Locations RW System settings RW. ClickShare

ClickShare Management Suiteessedisrl.eu/wp-content/uploads/2015/04/files_CSManagement_Suite.p… · Scheduler RW RW User management RW R Locations RW System settings RW. ClickShare

RW 3ULFLQJ /RW /RW - The Alford Company · 2019. 3. 25. · /rw 3ulflqj /rw /rw oliver mt.jst (858—296) oliver trust (858-296) 20' drainage easement \ 20' drainage easement 31

RW 3ULFLQJ /RW /RW - The Alford Company · 2019. 3. 25. · /rw 3ulflqj /rw /rw oliver mt.jst (858—296) oliver trust (858-296) 20' drainage easement \ 20' drainage easement 31

Wilo-EMU FA + FK 17.1, FK 202, FK 34, FK 42productfinder-wilo.cdn.mediamid.com › pfcdndoc › wilo108161 › 7536… · General information en Installation and operating instructions

Wilo-EMU FA + FK 17.1, FK 202, FK 34, FK 42productfinder-wilo.cdn.mediamid.com › pfcdndoc › wilo108161 › 7536… · General information en Installation and operating instructions

git-flow - jesusamieiro.com · $ git flow release help $ git flow release list $ git flow release start 0.1.0 $ git branch -a -v $ echo "0.1.0" >> version.txt $ git add version.txt

git-flow - jesusamieiro.com · $ git flow release help $ git flow release list $ git flow release start 0.1.0 $ git branch -a -v $ echo "0.1.0" >> version.txt $ git add version.txt

Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

ALaboratoryIntroductionto git and GitHubnewton.cx/~peter/files/git-lab-handout.pdf · git status, git checkout 7 Topic 3: git status, git checkout Fundamentally, Now,insomecircumstancesHEAD

ALaboratoryIntroductionto git and GitHubnewton.cx/~peter/files/git-lab-handout.pdf · git status, git checkout 7 Topic 3: git status, git checkout Fundamentally, Now,insomecircumstancesHEAD