Unleashing git power

Nov 18, 20190 likes140 views

Sono sempre di pi�� gli sviluppatori che usano sistemi per il controllo di versione del software e tra questi strumenti Git �� diventato uno standard de-facto. Cloni, Pull(i), Commit(ti), push(i) ...niente di pi�� semplice, vero? ...ma ti �� mai capitato di aggiungere un commit sul branch sbagliato (ed ovviamente push-ato sul repository remoto)? ...o di voler correggere il tuo codice con un singolo commit preso di un branch completamente diverso (ma niente altro)? ...mai trovato intrappolato in un conflitto di merge mentre git ti trascina nella tana del bianconiglio? Niente paura, abbiamo un paio di comandi esotici che renderanno pi�� semplice la tua vita da programmatore (e quella dei tuoi colleghi).

November 16, 2019
SEESAW
GIT POWER
UNLEASHING

MICHELE
FRANZIN
CTO & DIRECTOR
@REALFUZZY

git is a free and opensource
distributed version control
system designed to handle
everything from small to very large
projects with speed and
ef?ciency

https://marklodato.github.io/visual-git-guide/

$> git stash
Directory di lavoro e stato indice salvati: WIP on
develop: 0f54a61 removed websocket messaging test
from controller
$> git status
Sul branch develop
Il tuo branch �� aggiornato rispetto a 'origin/
develop'.
non c'�� nulla di cui eseguire il commit, l'albero di
lavoro �� pulito
$> git stash list
stash@{0}: WIP on develop: 0f54a61 removed websocket
messaging test from controller
stash@{1}: On develop:
��
$> git stash pop
https://i.stack.imgur.com/

$> git stash save ��award winning name��
$> git stash clear
$> git stash save --keep-index
PRO
TIPS

https://www.atlassian.com/git/tutorials/

WHERE ARE WE GOING?
https://twitter.com/skeeter/status/621455383987650560

LOST CONTROL OF
YOUR REPO ?
https://i.stack.imgur.com/

MAY INTERFERE WITH
THE WAY YOU WRITE CODE
SPOILER
ALERT
!

READABLE
HISTORY
https://www.endoflineblog.com/

3. RESISTANCE IS FUTILE
aka RESOLVE YOUR CONFLICTS

$> git rebase ��-abort
$> git rebase ��-skip
$> git rebase ��-continue
��after some
magic
happened��

A CONFLICT RESOLUTION TOOL
https://www.semanticmerge.com/

DON��T BE SHY
commit 5c687f002f4730a428510b8c9d3155093504d2da
Merge: 4f4e5fb 2d43b94
Author: Thomas Rossetto <thomas.rossetto@seesaw.it>
Date: Thu Oct 3 11:51:37 2019 +0200
Merge branch 'develop'
Con flicts:
Gemfile
Gemfile.lock
app/assets/stylesheets/active_admin.scss
config/environments/production.rb
db/schema.rb
PRO
TIPS

?Git is hard, but rocks
?Code as documentation (for real)
?Don��t merge give up & rebase
?Developer Happiness
?Colleague happiness
TAKEAWAYS
https://www.semanticmerge.com/

SEESAW
Corso del popolo, 57
35131 Padova - PD
049 8594764
www.seesaw.it
info@seesaw.it
@seesaw_it
https://www.linkedin.com/company/seesaw-s-r-l-/
https://www.facebook.com/seesawit/

The document discusses various libraries and techniques for developing Android Wear applications including: - Retrofit for making API calls from a smartphone app to a web service. - Picasso for loading and caching images from URLs in both smartphone and wear apps. - DaVinci, an image loading and caching library designed specifically for Android Wear. - Emmet, a library for protocol-based communication between a smartphone and wear app using data transfer via Bluetooth.

G* on GAE/J ��龎Tsuyoshi Yamamoto

This document provides instructions for creating a Grails application to manage event data using a Google App Engine backend datastore. It demonstrates creating Event domain classes and controllers, installing plugins for calendar integration and CSS styling, configuring the App Engine plugin and datastore indexes, deploying the application to App Engine, and performing basic CRUD operations on Event data in the datastore.

Essential git fu for tech writersGaurav Nelson

Git Distributed Version Control SystemVictor Wong

The document provides an outline on installing and configuring Git, introduces common Git concepts and commands, discusses various Git workflows and hosting options on GitHub and Bitbucket, and includes examples of using Git in case studies. It covers topics such as setting up a local and global Git configuration, interacting with the staging area and working directory, branching and merging, and resolving conflicts. The document is intended to teach users the basics of using the popular version control system Git.

Loading...gitRafael Garc��a

The document provides an introduction and overview of Git. It begins with an introduction of the presenter and then asks poll questions to gauge who is and isn't using source code management systems. It then proceeds to explain what Git is, why it's useful, how to configure and set up a Git repository, how to add and commit changes, create and switch branches, undo changes, and work with remote repositories and resolve conflicts.

Git branching model_for_tap_teamGrzegorz Wilczynski

Gittalkprtinsley

Git is a distributed version control system that allows developers to work on codebases simultaneously and merge changes easily. It uses a local repository that can be synced to remote repositories hosted on services like GitHub. Developers clone repositories, make changes on branches, commit locally, and push updates to the remote. Git addresses issues like file locking and enables features like easy merging and reverting changes. Stashing is used to temporarily store uncommitted changes when switching branches. GUI clients and documentation on sites like GitHub help users learn and use Git's powerful capabilities for collaboration.

Git - Get Ready To Use ItDaniel Kummer

This document provides an introduction to using Git. Some key points: - Git is a distributed version control system that is different from CVS/SVN in that nearly every operation is local and Git stores snapshots of files rather than differences. - The basics of using Git involve recording changes by checking status, adding files, committing changes, and working with remotes like origin. - Additional topics covered include undoing changes, working with others through branching and merging, tagging versions, and using tools like interactive mode and stashing.

Get going with_git_pptMiraz Al-Mamun

1. Git is a distributed version control system designed by Linus Torvalds to track changes in source code during software development. It allows for fast branching and merging of code. 2. In Git, code is stored on local and remote repositories. The basic Git workflow involves initializing a local repository, making changes to code, staging files, committing changes, and pushing commits to a remote repository. 3. Git provides tools to tag specific points in a code's history, such as releases. Tags can be annotated, with a message, to provide context around the code at that snapshot.

Gitlab Training with GIT and SourceTreeTeerapat Khunpech

Git workflows presentationMack Hardy

Nicola Iarocci - Git stories from the front line - Codemotion Milan 2017Codemotion

This document provides numerous examples of Git aliases that can help streamline workflows. It begins by demonstrating aliases for common commands like status, last commit, checkout, add, commit, reset, and grep. It then shows more advanced aliases for managing branches, commits, and reflogs. Throughout, it emphasizes that aliases can make workflows more efficient by avoiding repetitive tasks and that teams should consider sharing standardized aliases. It concludes by encouraging readers to continually learn Git, customize workflows for their needs, and view themselves as craftspeople improving their skills.

Becoming a Git MasterNicola Paolucci

This document provides tips and techniques for becoming a Git master, including: 1. Creating aliases to simplify common Git commands like committing and adding remotes. Aliases allow parameters and bash functions for complex commands. 2. Using features like assume-unchanged to hide files from Git and rerere to automate resolving similar conflicts. 3. Interactive rebasing to polish commit histories by squashing, rewording, and fixing up commits. Rebasing rewrites history so care is needed. 4. Techniques for preventing history tampering like reject force pushes and signing tags for verification. GPG keys can be stored and imported in Git. 5. Handling project dependencies with build tools or

Using Git as your VCS with Bioconductortimyates

The document discusses using Git and git-svn to manage version control for Bioconductor packages. It recommends cloning specific revisions of packages from the Bioconductor Subversion repository using git-svn to get the full history while avoiding downloading the entire repository. It provides examples of common Git and git-svn commands that can be used for making changes locally and committing them back to the Subversion repository. The workflow suggested makes changes on a local Git branch tracking the remote Subversion branch, then cherry-picks the commits to other branches as needed.

Git basicsAmit Sawhney

Git is a distributed version control system designed to handle small and large projects with speed and efficiency. It allows for fast branching and merging. Git keeps an archive of all code changes over time, allows comparing changes and reverting to old releases, and provides accountability. The basic Git workflow involves modifying files in the working directory, staging files to add a snapshot to the staging area, and committing files which permanently stores the snapshot. Remote branches allow collaborating on code by fetching and pushing changes between local and remote repositories. Common commands include pull, push, commit, branch, tag, merge, and checkout.

Geek gitSalah Chalermthai

This document provides an overview of a Git training course titled "Git-4-Geeks". It introduces Git and its history, explaining how Linus Torvalds created Git as a replacement for BitKeeper. It then covers common Git commands like init, clone, add, commit, branch, merge, rebase, and resolve conflicts. It discusses distributed version control and branching workflows. It also addresses tagging, remote repositories, and resolving merge conflicts. The goal is to teach attendees the fundamentals of using Git through scenario-based problems and solutions.

GitLab on OpenShiftConSol Consulting & Solutions Software GmbH

The document discusses installing and managing GitLab on OpenShift. It covers preparatory steps like installing required software and configuring permissions. It then describes installing GitLab using Helm charts, including composing a values file. The document discusses issues that may occur and how to fix them. It also covers upgrading GitLab, backup and restore processes, disaster recovery, and data migration.

Intro to Git DevOps Tally Presentation 101615Brian K. Vagnini

Git is a version control system that allows tracking changes to files. It works by taking snapshots of files and storing reference hashes locally. There are three main stages - modified, staged, and committed. Git recommends following a workflow that involves making changes on a development branch, testing, merging to master, and pushing to a remote repository. Common commands include git add to stage changes, git commit to commit them locally, and git push to push to a remote. Branches allow parallel development, and git merge is used to integrate branches.

Git the Docs: A fun, hands-on introduction to version controlBecky Todd

Scaling Development Environments with DockerDocker, Inc.

This document discusses using Docker to create a scalable development environment. It outlines setting up containers for different development components like the build server, production servers, and tools. Templates are used to configure container dependencies and build processes. The goal is allowing developers to run all components locally for testing and to reproduce the production environment.

Introduction to Git for ArtistsDavid Newbury

This document provides instructions for getting started with Git and GitHub. It outlines the steps to install Git, create a GitHub account, download repositories from GitHub, fork repositories, create branches, create pull requests, and create your own repository. It also explains key Git concepts like version control, local and remote repositories, and the three trees in Git. The document recommends configuring user information and SSH keys. It demonstrates common Git commands like init, status, add, commit, push, pull, clone and checkout. It discusses merge conflicts and meaningful commit messages. Finally, it points to additional resources and provides a practice project for following the GitHub flow.

Wokshop de Git Alberto Leal

Git is a distributed version control system that allows developers to work independently and asynchronously on features or bug fixes through branches. Branches allow developers to commit changes frequently without disrupting the main codebase. If a branch is ready, a developer can merge the branch back into the main branch. Git also uses a commit and diff system to track changes at a file level, making it easy to revert changes or roll back to previous versions if needed. The distributed nature of Git provides advantages over centralized systems like SVN by allowing independent repositories and easy conflict resolution during merges.

Docker commandEric Ahn

This document summarizes the steps to build and run a Docker container for Nginx. It describes creating a Dockerfile that installs Nginx on Ubuntu, builds the image, runs a container from the image mounting a local directory, and commits changes to create a new image version. Key steps include installing Nginx, exposing ports 80 and 443, committing a container to create a new image with added files, and using Docker commands like build, run, commit, diff and inspect.

GitGayan Kalanamith Mannapperuma

Git - An IntroductionBehzad Altaf

This document provides an overview of version control and Git. It discusses what version control is, why it is used, and common types including local, centralized, and distributed. It then focuses on Git, covering its history and origins from Linux kernel development. Key Git concepts are explained like data storage, file lifecycles, basic commands like clone, add, commit, branch, merge, and working with remotes. Tips are provided on installation, ignoring files, using with IDEs, and further learning resources.

Git in pills : git stashFederico Panini

Introducci��n a git y GitHubLucas Videla

Trasformare un'applicazione monolitica in microservices (versione #daje)michele franzin

C'�� un enorme interesse intorno alle architetture a microservice ... quasi ogni conferenza IT ha una sessione che ne parla. Una chiara idea dei benefici / insidie che questo approccio porta con s�� cruciale per adottarlo con successo in un progetto. In questa presentazione condivido alcune delle esperienze fatte durante lo smantellamento di un'applicazione monolitica in microservices. Vengono analizzati alcuni dei motivi che giustificano l'adozione di questo tipo di architettura, analizzate alcune delle questioni pi�� importanti da considerare e rivelo alcuni approcci che hanno avuto successo nella nostra esperienza. Presentazione tenuta al Codemotion 2016 a Roma. Nota: Questa �� una versione adattata della presentazione, senza effetti e animazioni.

Come ti smantello un'app monolitica in microservicesmichele franzin

Presentazione tenuta al Rubyday 2015 a Torino. C'�� un enorme interesse intorno alle architetture microservice ... quasi ogni conferenza IT ha una sessione che ne parla. Una chiara idea dei benefici / insidie che questo approccio porta con s�� cruciale per adottarla con successo in un progetto. In questa presentazione condivido alcune delle esperienze fatte durante lo smantellamento di un'applicazione monolitica in microservices. Analizzo alcuni dei motivi che giustificano l'adozione di questo tipo di architettura, parlo delle questioni pi�� importanti da considerare e rivelo alcuni approcci che hanno avuto successo nella nostra esperienza. Nota: Questa �� una versione adattata della presentazione, senza effetti e animazioni.

More Related Content

Similar to Unleashing git power (20)

Git - Get Ready To Use ItDaniel Kummer

Get going with_git_pptMiraz Al-Mamun

Gitlab Training with GIT and SourceTreeTeerapat Khunpech

Git workflows presentationMack Hardy

Nicola Iarocci - Git stories from the front line - Codemotion Milan 2017Codemotion

Becoming a Git MasterNicola Paolucci

Using Git as your VCS with Bioconductortimyates

Git basicsAmit Sawhney

Geek gitSalah Chalermthai

GitLab on OpenShiftConSol Consulting & Solutions Software GmbH

Intro to Git DevOps Tally Presentation 101615Brian K. Vagnini

Git the Docs: A fun, hands-on introduction to version controlBecky Todd

Scaling Development Environments with DockerDocker, Inc.

Introduction to Git for ArtistsDavid Newbury

Wokshop de Git Alberto Leal

Docker commandEric Ahn

GitGayan Kalanamith Mannapperuma

Git - An IntroductionBehzad Altaf

Git in pills : git stashFederico Panini

Introducci��n a git y GitHubLucas Videla

Git - Get Ready To Use ItDaniel Kummer

Get going with_git_pptMiraz Al-Mamun

Gitlab Training with GIT and SourceTreeTeerapat Khunpech

Git workflows presentationMack Hardy

Nicola Iarocci - Git stories from the front line - Codemotion Milan 2017Codemotion

Becoming a Git MasterNicola Paolucci

Using Git as your VCS with Bioconductortimyates

Git basicsAmit Sawhney

Geek gitSalah Chalermthai

GitLab on OpenShiftConSol Consulting & Solutions Software GmbH

Intro to Git DevOps Tally Presentation 101615Brian K. Vagnini

Git the Docs: A fun, hands-on introduction to version controlBecky Todd

Scaling Development Environments with DockerDocker, Inc.

Introduction to Git for ArtistsDavid Newbury

Wokshop de Git Alberto Leal

Docker commandEric Ahn

GitGayan Kalanamith Mannapperuma

Git - An IntroductionBehzad Altaf

Git in pills : git stashFederico Panini

Introducci��n a git y GitHubLucas Videla

More from michele franzin (8)

Trasformare un'applicazione monolitica in microservices (versione #daje)michele franzin

Come ti smantello un'app monolitica in microservicesmichele franzin

1 anno di sviluppo prodotto con un team distribuitomichele franzin

Sviluppare un prodotto con un team distribuito �� una sfida non banale sotto molti aspetti: far funzionare bene il team, sviluppare il prodotto, rispettare tempi e budget... In questo talk vorremmo condividere alcune delle esperienze fatte in un lavoro durato oltre un anno e che ci ha messi pi�� volte alla prova per raggiungere il risultato promesso. Intervento tenuto al Tech Meetup Tour di Codemotion il 26 ottobre 2015

Microservices: cosa sono e quando non usarlimichele franzin

...hai detto CQRS a chi ?!?!?! michele franzin

Ruby 20th birthdaymichele franzin

Magie di gitmichele franzin

- Git is an open source version control system designed to handle large projects efficiently with non-linear and distributed development. - It uses cryptographic authentication and supports HTTP, FTP, SSH, rsync or its own Git protocol. - Basic Git workflow involves making changes, staging them with git add, and committing with descriptive messages. History can be explored with commands like git log and git show.

from(0).to('rubygems.org')michele franzin

This document discusses RubyGems and the process for creating and publishing a Ruby gem. It explains that a gem is a packaged Ruby application or library with a name and version. It then provides steps for building a gem using different tools like Bundler, Jeweler, and Hoe+Echoe. It also outlines the process of building, installing and publishing a gem to RubyGems.org including using a Rubygems API key in the credentials file.

Trasformare un'applicazione monolitica in microservices (versione #daje)michele franzin

Come ti smantello un'app monolitica in microservicesmichele franzin

1 anno di sviluppo prodotto con un team distribuitomichele franzin

Microservices: cosa sono e quando non usarlimichele franzin

...hai detto CQRS a chi ?!?!?! michele franzin

Ruby 20th birthdaymichele franzin

Magie di gitmichele franzin

from(0).to('rubygems.org')michele franzin

Recently uploaded (20)

DriverPack Solution Download Full ISO (Latest 2025)abidhassan123aa

Oxford English for Aviation Book for studentstuyen nguyen

English for Logistics has been developed specifically for people who work in the logistics industry and who need English to communicate in a variety of situations with colleagues, clients, and business partners. It supplies you with the target vocabulary and commonly used expressions that are essential to communication whether you work for a shipping agent, a customs broker, or a freight forwarder. English for Logistics covers a range of subjects associated with the logistics industry. Learners in management-level positions will find their needs catered for, just as much as those in warehousing or administration. Units from the book work independently and can be selected according to the needs and interests of the course participants. English for Logistics is also ideal for self-study. Each unit begins with a Starter, which consists of a short exercise or a quiz and serves as an introduction to the topic of the unit. Practical exercises, listening extracts, industry-specific texts as well as photos and illustrations help you to acquire key vocabulary and expressions. Realistic role-plays give you the opportunity to put all you have learned into practice. Each unit closes with an Output activity, an article related to the topic of the unit followed by questions for reflection and discussion. Finally the book finishes up with a fun quiz to Test yourself! on some of the facts and figures discussed over the previous eight units. The MultiROM contains all the Listening extracts from the book. These can be played through the audio player on your computer, or through a conventional CD player. In order to give yourself extra listening practice, listen to it in your car. The Interactive exercises let you review your learning by doing Useful phrases, Vocabulary, and Communication exercises on your computer. This will be particularly valuable if you are using the book for self-study. In the appendix of English forLogisticsyou will find the Partner Files for the role-plays and the Answer key so that you can check your own answers if you are working alone. There are also Transcripts of the listening extracts, an A-Z word list, and a list of Usefulphrases and vocabulary. Finally, we have included a Glossary of acronyms and abbreviations and a Weights and measures conversion chart; these can be used as handy references at work. OXFORD UNlVERSJTY PRESS Greac Clarendon Street. Oxford ox2 6DP Oxford University Press is a department of the University of Oxford. lefurthers che University"s objectiveof excellence in research.scholarship. and education by publishing worldwide in Oxford NewYork Auckland Cape Town Dar es Salaam Hong Kong Karachi Kuala Lumpur Madrid Melbourne Mexico City Nairobi New Delhi Shanghai Taipei Toronto With offices in Argentina Austria Brazil Chile Czech Republic France Greece Guatemala Hungary Italy Japan Poland Portugal Singapore South Korea Swiczerland Thailand Turkey Ukraine Vietnam OXFORD and OXFORD fNGllSll areregistered trade marks of

Wondershare MobileTrans Crack [2025] Downloadwaqasraza123aa

Wondershare UniConverter Crack Download Latest 2025tanveerbhaikp06

Amaze Dynamic Odoo Dashboard - Odoo Dashboard SolutionAagam infotech

Best Dashboard + Grow business = Amaze Dynamic Odoo dashboards for Sales, CRM, Inventory, Accounting, POS, Purchase, project dashboard ?Visit And Buy Now : https://bit.ly/4fLC2Tz ?It's perfect tool to create your own custom dashboards for sales, CRM, POS, inventory, invoicing, purchase, and projects. Get ready to amaze yourself!? ?Lets check out some amazing features of odoo dashboard #amaze:? Main features of Amaze Dynamic Odoo Dashboards? ?Big Screen Supported ?Fully Responsive Dashboard ?drag and resize the charts/list view ?Major charts and graphs type supported ?Beautiful UI And more...... Just click on below app link? and download Odoo All in one Dynamic #Amaze dashboard module ?App download now :? Odoo 18 : https://bit.ly/4fLC2Tz Odoo 16 : https://bit.ly/3HkAEcG Odoo 15 : https://bit.ly/3CINA7C Odoo 14 : https://bit.ly/3q5NAtn Odoo 13 : https://bit.ly/3IdCusn Odoo 12 : https://bit.ly/3MTW6Wf Odoo 11: https://bit.ly/3i6W7bd ?Want a DEMO : ? business@aagaminfotech.com ?Explore more odoo Apps : https://bit.ly/3y02ofI ?Want to know more "Aagaminfotech ": ?http://www.aagaminfotech.com

Brave Browser 1.68.134 Crack free downloadcottonmouth7016

Microsoft Safety Scanner 1.415.424.0 Crack Free Downloadalihamzakpa02

Cadence Fidelity Pointwise Crack 2024.1 Full version 2025madni03kp

Integration Testing in 2025: Best Practices for Reliable SoftwareShubham Joshi

Ensuring seamless communication between APIs, microservices, and third-party services is essential for software reliability. Integration testing helps detect compatibility issues early, preventing system failures. Best practices include contract testing to validate API interactions, service virtualization to simulate dependencies, and automated testing for continuous validation. A strong integration strategy reduces risks, improves performance, and ensures smooth deployments.

Toon Boom Harmony Premium Crack Activation Keyraffayihan9

Enscape 3D 3.5.5 Crack + License key 2025alihamza01kp

sensor_tower__state_of_mobile_2025__Vietnam.pdfAnhTrnQunh6

ManyCam 9.1.0.5 Crack free software downloadhebosay262

Markdown Monster 3.3.17 Crack Free Downloadalihamzakpa06

Adobe After Effects 2024 Crack free downloadkilot64299

Movavi Video Editor Plus 2024 24.1.1 Crackmultenoydo

USING GRAALVM IN PRODUCTION - JAVAONE.pdfAlina Yurenko

Explorer Patcher 22621.3880.66.4 Crack Free Downloadalihamzakpa07

IObit Advanced SystemCare Pro crack free softwarerigimas859

What's New? ThousandEyes Product Features and Highlights for February 2025ThousandEyes

DriverPack Solution Download Full ISO (Latest 2025)abidhassan123aa

Oxford English for Aviation Book for studentstuyen nguyen

Wondershare MobileTrans Crack [2025] Downloadwaqasraza123aa

Wondershare UniConverter Crack Download Latest 2025tanveerbhaikp06

Amaze Dynamic Odoo Dashboard - Odoo Dashboard SolutionAagam infotech

Brave Browser 1.68.134 Crack free downloadcottonmouth7016

Microsoft Safety Scanner 1.415.424.0 Crack Free Downloadalihamzakpa02

Cadence Fidelity Pointwise Crack 2024.1 Full version 2025madni03kp

Integration Testing in 2025: Best Practices for Reliable SoftwareShubham Joshi

Toon Boom Harmony Premium Crack Activation Keyraffayihan9

Enscape 3D 3.5.5 Crack + License key 2025alihamza01kp

sensor_tower__state_of_mobile_2025__Vietnam.pdfAnhTrnQunh6

ManyCam 9.1.0.5 Crack free software downloadhebosay262

Markdown Monster 3.3.17 Crack Free Downloadalihamzakpa06

Adobe After Effects 2024 Crack free downloadkilot64299

Movavi Video Editor Plus 2024 24.1.1 Crackmultenoydo

USING GRAALVM IN PRODUCTION - JAVAONE.pdfAlina Yurenko

Explorer Patcher 22621.3880.66.4 Crack Free Downloadalihamzakpa07

IObit Advanced SystemCare Pro crack free softwarerigimas859

What's New? ThousandEyes Product Features and Highlights for February 2025ThousandEyes

Unleashing git power

1. November 16, 2019 SEESAW GIT POWER UNLEASHING

2. MICHELE FRANZIN CTO & DIRECTOR @REALFUZZY

3. SEESAW

4. SWING+

5. https://xkcd.com/

6. POLL TIME http://sli.do/ #A781

7. WHY BOTHER ?!?

8. git is a free and opensource distributed version control system designed to handle everything from small to very large projects with speed and ef?ciency

9. https://marklodato.github.io/visual-git-guide/

10. 1. UNINTERRUPTED

11. http://www.keepcalmandposters.com

12. $> git stash Directory di lavoro e stato indice salvati: WIP on develop: 0f54a61 removed websocket messaging test from controller $> git status Sul branch develop Il tuo branch �� aggiornato rispetto a 'origin/ develop'. non c'�� nulla di cui eseguire il commit, l'albero di lavoro �� pulito $> git stash list stash@{0}: WIP on develop: 0f54a61 removed websocket messaging test from controller stash@{1}: On develop: �� $> git stash pop https://i.stack.imgur.com/

13. $> git stash Directory di lavoro e stato indice salvati: WIP on develop: 0f54a61 removed websocket messaging test from controller $> git status Sul branch develop Il tuo branch �� aggiornato rispetto a 'origin/ develop'. non c'�� nulla di cui eseguire il commit, l'albero di lavoro �� pulito $> git stash list stash@{0}: WIP on develop: 0f54a61 removed websocket messaging test from controller stash@{1}: On develop: �� $> git stash pop https://i.stack.imgur.com/

14. $> git stash Directory di lavoro e stato indice salvati: WIP on develop: 0f54a61 removed websocket messaging test from controller $> git status Sul branch develop Il tuo branch �� aggiornato rispetto a 'origin/ develop'. non c'�� nulla di cui eseguire il commit, l'albero di lavoro �� pulito $> git stash list stash@{0}: WIP on develop: 0f54a61 removed websocket messaging test from controller stash@{1}: On develop: �� $> git stash pop https://i.stack.imgur.com/

15. $> git stash save ��award winning name�� $> git stash clear $> git stash save --keep-index PRO TIPS

16. 2. BE KIND: REBASE better before merge

17. https://www.atlassian.com/git/tutorials/

18. https://www.atlassian.com/git/tutorials/

19. COMPLEX https://blog.infernored.com

20. CAOTHIC https://engineering.upside.com/

21. WHERE ARE WE GOING? https://twitter.com/skeeter/status/621455383987650560

22. LOST CONTROL OF YOUR REPO ? https://i.stack.imgur.com/

23. MAY INTERFERE WITH THE WAY YOU WRITE CODE SPOILER ALERT !

24. https://www.atlassian.com/git/tutorials/

25. READABLE HISTORY https://www.endoflineblog.com/

26. THE GOLDEN RULE OF REBASING PRO TIPS

27. 3. RESISTANCE IS FUTILE aka RESOLVE YOUR CONFLICTS

28. $> git rebase ��-abort $> git rebase ��-skip $> git rebase ��-continue ��after some magic happened��

29. A CONFLICT RESOLUTION TOOL https://www.semanticmerge.com/

30. DON��T BE SHY commit 5c687f002f4730a428510b8c9d3155093504d2da Merge: 4f4e5fb 2d43b94 Author: Thomas Rossetto <thomas.rossetto@seesaw.it> Date: Thu Oct 3 11:51:37 2019 +0200 Merge branch 'develop' Con flicts: Gemfile Gemfile.lock app/assets/stylesheets/active_admin.scss config/environments/production.rb db/schema.rb PRO TIPS

31. ?Git is hard, but rocks ?Code as documentation (for real) ?Don��t merge give up & rebase ?Developer Happiness ?Colleague happiness TAKEAWAYS https://www.semanticmerge.com/

32. SEESAW Corso del popolo, 57 35131 Padova - PD 049 8594764 www.seesaw.it info@seesaw.it @seesaw_it https://www.linkedin.com/company/seesaw-s-r-l-/ https://www.facebook.com/seesawit/

�ݺ�ߣ

Unleashing git power

Recommended

More Related Content

Similar to Unleashing git power (20)

More from michele franzin (8)

Recently uploaded (20)

Unleashing git power