SlideShare uma empresa Scribd logo

Git and GitHub: Lifting ourselves out of SVN

•
•
Sebastiaan Deckers
Sebastiaan Deckers

Git is a version control system that is better than SVN for several reasons: 1. Git allows for cheap and easy local branching so developers can work independently without affecting others. 2. With Git, the entire codebase history is downloaded when cloning a repository, enabling highly responsive local operations and distribution of work. 3. Common Git workflows like the Git Flow process support integration manager and dictator/lieutenant models for code collaboration on GitHub repositories.

Tecnologia
1 de 33
Baixar para ler offline
Git and GitHub Lifting ourselves out of SVN Sebastiaan Deckers November 2011
What's wrong with SVN? Git is just better.
http:// Why Git Is Better Than X .com/ Features Workflow ● Cheap Local ● Subversion-Style Branching Workflow ● Everything is Local ● Integration ● Git is Fast Manager Workflow ● Git is Small ● Dictator and ● The Staging Area Lieutenants ● Distributed Workflow ● GitHub ● Easy to Learn
Git clients? Windows: TortoiseGit Mac: Github.app, Tower ($59)
Workflow Add source code files so that Git tracks them in the local repository. Commit your changed files to the local repo. Push to upload your commits to GitHub. Pull to get commits from GitHub.
Command Line
commit add push pull fetch etc... git help <command> Your friendly neighbourhood documentation.
svn checkout <url> <dir> git clone <url> <dir> ... but wait, it's better! Full revision history No single point of failure Fast transfer speed
svn update git pull <remote> <branch> ... but wait, it's better! Merge branches Each developer has their own remote Hack together without affecting others
svn add git add --all ... but wait, it's better! Just kidding. It's pretty much the same. But add also used to mark merge conflicts as resolved.
svn commit git push <remote> <branch> ... but wait, it's better! As with pull, you can push to anywhere.
What is this I don't even...
remote ≈ SVN repository URL A remote is a bookmark of another Git repository. It represents a Git repo by its URL. The default remote is called "origin". The origin remote has no special meaning and is merely convention.
refspec ≈ SVN branch name A refspec is the name of a branch or tag, or the SHA-1 of a particular commit. The default refspec is called "master". The master refspec has no special meaning and is merely convention.
commit ≈ SVN revision/commit Changes to files are identified by a SHA-1 hash. Can usually be referenced by the first few characters. Allows Git to do fast comparisions, error checking, compact storage.
Commit Log
git log commit 4f94c3059851fedce2d92f19af98d67ec8c2be69 Author: Thomas Gorissen <thomas@adzcentral.com> Date: Wed Nov 2 09:23:41 2011 +0000 Changed date interpretation to adapt server change git-svn-id: https://subversion.assembla.com/svn/adz/uinew@4672 3c9e7dd8-c376-4c09-bcd8-96044d63829d
git log --oneline 4f94c30 Changed date interpretation to adapt server change 501753c Fixing creative click tracking test cce1c63 Changing maximum bid to bid-price 23aad1c Override the aggregated status with only the primary status. 4b2f730 Increased version number to 1.5.5 84aed45 Show the filter ID when a name is missing 5ae3f2f not overriding backup picture with old one on upload 38af93b removing now unnecessary code to reference backupID 7dac9c0 Redirecting user to #Home if he doesn't accept terms 02afc23 Added ISO date parsing b30d440 Changed sessionTimeout to be understood as seconds a57adf0 Not querying for rejected creatives on select popup in CI bc4c93a Recursively apply the active selection on search results 7ad1401 Highlighting error fields on credit limit change
git log --grep=refactoring 3b9c48e Preparations for Tree control refactoring d3f32f9 Code cleanup/ refactoring b7d58d0 Minor code refactoring 83a2235 Minor refactoring for improved trickery ba83e28 Massive refactoring of the filters control. Now supports disabling entire menu sections on-the-fly. 98e9232 Lots of refactoring to show Pending Approvals as a widget anywhere
git log --author=seb 23aad1c Override the aggregated status with only the primary status. 6a9f696 Fixed showing the platform support dagger symbol on search results 84aed45 Show the filter ID when a name is missing 78a9948 Asynchronous rendering with a loading indicator for audience template loading/saving bc4c93a Recursively apply the active selection on search results edb35be Fixed recursive selection to activate all parents cbe9542 Removed dead code :)
Branching
git branch List, create, or delete branches Warning: Does not switch branch! #wtfgit
git checkout [-b] <branchname> Creates a new branch and switches to it.
git merge <branchname> Merges branchname into the current branch.
Branching Example http://book.git-scm. com/3_basic_branching_and_merging.html
GitHub
Commit History Who's doing what
Pull Requests Code review and collaboration
Crazy Stats
Questions? RTFM http://book.git-scm.com/ http://help.github.com/

Recomendados

Git basics for beginners
Git basics for beginnersGit basics for beginners
Git basics for beginnersPravallikaTammisetty
 
Open Source Collaboration With Git And Git Hub
Open Source Collaboration With Git And Git HubOpen Source Collaboration With Git And Git Hub
Open Source Collaboration With Git And Git HubNick Quaranto
 
Intro to git and git hub
Intro to git and git hubIntro to git and git hub
Intro to git and git hubVenkat Malladi
 
Git and git flow
Git and git flowGit and git flow
Git and git flowFran García
 
Git
GitGit
GitShinu Suresh
 
Git Tricks — git utilities that make life git easier
Git Tricks — git utilities that make life git easierGit Tricks — git utilities that make life git easier
Git Tricks — git utilities that make life git easierChristoph Matthies
 
Git
GitGit
GitMayank Patel
 
Git advanced
Git advancedGit advanced
Git advancedPeter Vandenabeele
 

Recomendados

Git basics for beginners
Git basics for beginnersGit basics for beginners
Git basics for beginnersPravallikaTammisetty
 
Open Source Collaboration With Git And Git Hub
Open Source Collaboration With Git And Git HubOpen Source Collaboration With Git And Git Hub
Open Source Collaboration With Git And Git HubNick Quaranto
 
Intro to git and git hub
Intro to git and git hubIntro to git and git hub
Intro to git and git hubVenkat Malladi
 
Git and git flow
Git and git flowGit and git flow
Git and git flowFran García
 
Git
GitGit
GitShinu Suresh
 
Git Tricks — git utilities that make life git easier
Git Tricks — git utilities that make life git easierGit Tricks — git utilities that make life git easier
Git Tricks — git utilities that make life git easierChristoph Matthies
 
Git
GitGit
GitMayank Patel
 
Git advanced
Git advancedGit advanced
Git advancedPeter Vandenabeele
 
Git - a powerful version control tool
Git - a powerful version control toolGit - a powerful version control tool
Git - a powerful version control toolKuo-Le Mei
 
Introduction git
Introduction gitIntroduction git
Introduction gitDian Sigit Prastowo
 
Git Version Control System
Git Version Control SystemGit Version Control System
Git Version Control SystemKMS Technology
 
Brief tutorial on Git
Brief tutorial on GitBrief tutorial on Git
Brief tutorial on Git聖文 鄭
 
The everyday developer's guide to version control with Git
The everyday developer's guide to version control with GitThe everyday developer's guide to version control with Git
The everyday developer's guide to version control with GitE Carter
 
Advanced Git Tutorial
Advanced Git TutorialAdvanced Git Tutorial
Advanced Git TutorialSage Sharp
 
Git and git workflow best practice
Git and git workflow best practiceGit and git workflow best practice
Git and git workflow best practiceMajid Hosseini
 
Introduction to Git and GitHub
Introduction to Git and GitHubIntroduction to Git and GitHub
Introduction to Git and GitHubBioinformatics and Computational Biosciences Branch
 
Git & GitHub for Beginners
Git & GitHub for BeginnersGit & GitHub for Beginners
Git & GitHub for BeginnersSébastien Saunier
 
Git best practices workshop
Git best practices workshopGit best practices workshop
Git best practices workshopOtto Kekäläinen
 
Git Tutorial I
Git Tutorial IGit Tutorial I
Git Tutorial IJim Yeh
 
Git Introduction Tutorial
Git Introduction TutorialGit Introduction Tutorial
Git Introduction TutorialThomas Rausch
 
Git and Github
Git and GithubGit and Github
Git and GithubWen-Tien Chang
 
Git and Github workshop
Git and Github workshopGit and Github workshop
Git and Github workshopOtto Kekäläinen
 
Recovering From Git Mistakes - Nina Zakharenko
Recovering From Git Mistakes - Nina ZakharenkoRecovering From Git Mistakes - Nina Zakharenko
Recovering From Git Mistakes - Nina ZakharenkoNina Zakharenko
 
GIT presentation
GIT presentationGIT presentation
GIT presentationNaim Latifi
 
Git tutorial
Git tutorialGit tutorial
Git tutorialPham Quy (Jack)
 
Git basic
Git basicGit basic
Git basicEmran Ul Hadi
 
Git - Get Ready To Use It
Git - Get Ready To Use ItGit - Get Ready To Use It
Git - Get Ready To Use ItDaniel Kummer
 
Introduction To Git
Introduction To GitIntroduction To Git
Introduction To GitArnaud Seilles
 
Git
GitGit
GitIT Booze
 
Wokshop de Git
Wokshop de Git Wokshop de Git
Wokshop de Git Alberto Leal
 

Mais conteúdo relacionado

Mais procurados

Git - a powerful version control tool
Git - a powerful version control toolGit - a powerful version control tool
Git - a powerful version control toolKuo-Le Mei
 
Git Version Control System
Git Version Control SystemGit Version Control System
Git Version Control SystemKMS Technology
 
Brief tutorial on Git
Brief tutorial on GitBrief tutorial on Git
Brief tutorial on Git聖文 鄭
 
The everyday developer's guide to version control with Git
The everyday developer's guide to version control with GitThe everyday developer's guide to version control with Git
The everyday developer's guide to version control with GitE Carter
 
Advanced Git Tutorial
Advanced Git TutorialAdvanced Git Tutorial
Advanced Git TutorialSage Sharp
 
Git and git workflow best practice
Git and git workflow best practiceGit and git workflow best practice
Git and git workflow best practiceMajid Hosseini
 
Git Tutorial I
Git Tutorial IGit Tutorial I
Git Tutorial IJim Yeh
 
Git Introduction Tutorial
Git Introduction TutorialGit Introduction Tutorial
Git Introduction TutorialThomas Rausch
 
Recovering From Git Mistakes - Nina Zakharenko
Recovering From Git Mistakes - Nina ZakharenkoRecovering From Git Mistakes - Nina Zakharenko
Recovering From Git Mistakes - Nina ZakharenkoNina Zakharenko
 
GIT presentation
GIT presentationGIT presentation
GIT presentationNaim Latifi
 
Git - Get Ready To Use It
Git - Get Ready To Use ItGit - Get Ready To Use It
Git - Get Ready To Use ItDaniel Kummer
 

Mais procurados (20)

Git - a powerful version control tool
Git - a powerful version control toolGit - a powerful version control tool
Git - a powerful version control tool
 
Introduction git
Introduction gitIntroduction git
Introduction git
 
Git Version Control System
Git Version Control SystemGit Version Control System
Git Version Control System
 
Brief tutorial on Git
Brief tutorial on GitBrief tutorial on Git
Brief tutorial on Git
 
The everyday developer's guide to version control with Git
The everyday developer's guide to version control with GitThe everyday developer's guide to version control with Git
The everyday developer's guide to version control with Git
 
Advanced Git Tutorial
Advanced Git TutorialAdvanced Git Tutorial
Advanced Git Tutorial
 
Git and git workflow best practice
Git and git workflow best practiceGit and git workflow best practice
Git and git workflow best practice
 
Introduction to Git and GitHub
Introduction to Git and GitHubIntroduction to Git and GitHub
Introduction to Git and GitHub
 
Git & GitHub for Beginners
Git & GitHub for BeginnersGit & GitHub for Beginners
Git & GitHub for Beginners
 
Git best practices workshop
Git best practices workshopGit best practices workshop
Git best practices workshop
 
Git Tutorial I
Git Tutorial IGit Tutorial I
Git Tutorial I
 
Git Introduction Tutorial
Git Introduction TutorialGit Introduction Tutorial
Git Introduction Tutorial
 
Git and Github
Git and GithubGit and Github
Git and Github
 
Git and Github workshop
Git and Github workshopGit and Github workshop
Git and Github workshop
 
Recovering From Git Mistakes - Nina Zakharenko
Recovering From Git Mistakes - Nina ZakharenkoRecovering From Git Mistakes - Nina Zakharenko
Recovering From Git Mistakes - Nina Zakharenko
 
GIT presentation
GIT presentationGIT presentation
GIT presentation
 
Git tutorial
Git tutorialGit tutorial
Git tutorial
 
Git basic
Git basicGit basic
Git basic
 
Git - Get Ready To Use It
Git - Get Ready To Use ItGit - Get Ready To Use It
Git - Get Ready To Use It
 
Introduction To Git
Introduction To GitIntroduction To Git
Introduction To Git
 

Semelhante a Git and GitHub: Lifting ourselves out of SVN

Using Git as your VCS with Bioconductor
Using Git as your VCS with BioconductorUsing Git as your VCS with Bioconductor
Using Git as your VCS with Bioconductortimyates
 
Git 入门与实践
Git 入门与实践Git 入门与实践
Git 入门与实践Terry Wang
 
Git 入门 与 实践
Git 入门 与 实践Git 入门 与 实践
Git 入门 与 实践Terry Wang
 
Git essential training & sharing self
Git essential training & sharing selfGit essential training & sharing self
Git essential training & sharing selfChen-Tien Tsai
 
Git Commands Every Developer Should Know?
Git Commands Every Developer Should Know?Git Commands Every Developer Should Know?
Git Commands Every Developer Should Know?9 series
 
Git from the trenches
Git from the trenchesGit from the trenches
Git from the trenchesNuno Caneco
 
Git - Intro to the Basics of DVCS
Git - Intro to the Basics of DVCSGit - Intro to the Basics of DVCS
Git - Intro to the Basics of DVCSMatthew McCullough
 
Git - Intro to the Basics of DVCS
Git - Intro to the Basics of DVCSGit - Intro to the Basics of DVCS
Git - Intro to the Basics of DVCSMatthew McCullough
 
Lets Git Together
Lets Git TogetherLets Git Together
Lets Git TogetherRakesh Jha
 
Practical git for developers
Practical git for developersPractical git for developers
Practical git for developersWim Godden
 

Semelhante a Git and GitHub: Lifting ourselves out of SVN (20)

Git
GitGit
Git
 
Wokshop de Git
Wokshop de Git Wokshop de Git
Wokshop de Git
 
M.Mozūras - git
M.Mozūras - gitM.Mozūras - git
M.Mozūras - git
 
Introduction to Git (Greg Lonnon)
Introduction to Git (Greg Lonnon)Introduction to Git (Greg Lonnon)
Introduction to Git (Greg Lonnon)
 
Subversion to Git Migration
Subversion to Git MigrationSubversion to Git Migration
Subversion to Git Migration
 
Git Tech Talk
Git Tech TalkGit Tech Talk
Git Tech Talk
 
GIT Basics
GIT BasicsGIT Basics
GIT Basics
 
Using Git as your VCS with Bioconductor
Using Git as your VCS with BioconductorUsing Git as your VCS with Bioconductor
Using Git as your VCS with Bioconductor
 
Git
GitGit
Git
 
Git 入门与实践
Git 入门与实践Git 入门与实践
Git 入门与实践
 
Git 入门 与 实践
Git 入门 与 实践Git 入门 与 实践
Git 入门 与 实践
 
Session git
Session gitSession git
Session git
 
Git foundation
Git foundationGit foundation
Git foundation
 
Git essential training & sharing self
Git essential training & sharing selfGit essential training & sharing self
Git essential training & sharing self
 
Git Commands Every Developer Should Know?
Git Commands Every Developer Should Know?Git Commands Every Developer Should Know?
Git Commands Every Developer Should Know?
 
Git from the trenches
Git from the trenchesGit from the trenches
Git from the trenches
 
Git - Intro to the Basics of DVCS
Git - Intro to the Basics of DVCSGit - Intro to the Basics of DVCS
Git - Intro to the Basics of DVCS
 
Git - Intro to the Basics of DVCS
Git - Intro to the Basics of DVCSGit - Intro to the Basics of DVCS
Git - Intro to the Basics of DVCS
 
Lets Git Together
Lets Git TogetherLets Git Together
Lets Git Together
 
Practical git for developers
Practical git for developersPractical git for developers
Practical git for developers
 

Último

Commit 2024 - Secret Management made easy
Commit 2024 - Secret Management made easyCommit 2024 - Secret Management made easy
Commit 2024 - Secret Management made easyAlfredo García Lavilla
 
SIP trunking in Janus @ Kamailio World 2024
SIP trunking in Janus @ Kamailio World 2024SIP trunking in Janus @ Kamailio World 2024
SIP trunking in Janus @ Kamailio World 2024Lorenzo Miniero
 
My INSURER PTE LTD - Insurtech Innovation Award 2024
My INSURER PTE LTD - Insurtech Innovation Award 2024My INSURER PTE LTD - Insurtech Innovation Award 2024
My INSURER PTE LTD - Insurtech Innovation Award 2024The Digital Insurer
 
What's New in Teams Calling, Meetings and Devices March 2024
What's New in Teams Calling, Meetings and Devices March 2024What's New in Teams Calling, Meetings and Devices March 2024
What's New in Teams Calling, Meetings and Devices March 2024Stephanie Beckett
 
Story boards and shot lists for my a level piece
Story boards and shot lists for my a level pieceStory boards and shot lists for my a level piece
Story boards and shot lists for my a level piececharlottematthew16
 
Developer Data Modeling Mistakes: From Postgres to NoSQL
Developer Data Modeling Mistakes: From Postgres to NoSQLDeveloper Data Modeling Mistakes: From Postgres to NoSQL
Developer Data Modeling Mistakes: From Postgres to NoSQLScyllaDB
 
"Federated learning: out of reach no matter how close",Oleksandr Lapshyn
"Federated learning: out of reach no matter how close",Oleksandr Lapshyn"Federated learning: out of reach no matter how close",Oleksandr Lapshyn
"Federated learning: out of reach no matter how close",Oleksandr LapshynFwdays
 
SAP Build Work Zone - Overview L2-L3.pptx
SAP Build Work Zone - Overview L2-L3.pptxSAP Build Work Zone - Overview L2-L3.pptx
SAP Build Work Zone - Overview L2-L3.pptxNavinnSomaal
 
Bun (KitWorks Team Study 노별마루 발표 2024.4.22)
Bun (KitWorks Team Study 노별마루 발표 2024.4.22)Bun (KitWorks Team Study 노별마루 발표 2024.4.22)
Bun (KitWorks Team Study 노별마루 발표 2024.4.22)Wonjun Hwang
 
"Subclassing and Composition – A Pythonic Tour of Trade-Offs", Hynek Schlawack
"Subclassing and Composition – A Pythonic Tour of Trade-Offs", Hynek Schlawack"Subclassing and Composition – A Pythonic Tour of Trade-Offs", Hynek Schlawack
"Subclassing and Composition – A Pythonic Tour of Trade-Offs", Hynek SchlawackFwdays
 
New from BookNet Canada for 2024: BNC CataList - Tech Forum 2024
New from BookNet Canada for 2024: BNC CataList - Tech Forum 2024New from BookNet Canada for 2024: BNC CataList - Tech Forum 2024
New from BookNet Canada for 2024: BNC CataList - Tech Forum 2024BookNet Canada
 
Advanced Test Driven-Development @ php[tek] 2024
Advanced Test Driven-Development @ php[tek] 2024Advanced Test Driven-Development @ php[tek] 2024
Advanced Test Driven-Development @ php[tek] 2024Scott Keck-Warren
 
DevEX - reference for building teams, processes, and platforms
DevEX - reference for building teams, processes, and platformsDevEX - reference for building teams, processes, and platforms
DevEX - reference for building teams, processes, and platformsSergiu Bodiu
 
Vertex AI Gemini Prompt Engineering Tips
Vertex AI Gemini Prompt Engineering TipsVertex AI Gemini Prompt Engineering Tips
Vertex AI Gemini Prompt Engineering TipsMiki Katsuragi
 
Unleash Your Potential - Namagunga Girls Coding Club
Unleash Your Potential - Namagunga Girls Coding ClubUnleash Your Potential - Namagunga Girls Coding Club
Unleash Your Potential - Namagunga Girls Coding ClubKalema Edgar
 
The Future of Software Development - Devin AI Innovative Approach.pdf
The Future of Software Development - Devin AI Innovative Approach.pdfThe Future of Software Development - Devin AI Innovative Approach.pdf
The Future of Software Development - Devin AI Innovative Approach.pdfSeasiaInfotech2
 
Install Stable Diffusion in windows machine
Install Stable Diffusion in windows machineInstall Stable Diffusion in windows machine
Install Stable Diffusion in windows machinePadma Pradeep
 
Kotlin Multiplatform & Compose Multiplatform - Starter kit for pragmatics
Kotlin Multiplatform & Compose Multiplatform - Starter kit for pragmaticsKotlin Multiplatform & Compose Multiplatform - Starter kit for pragmatics
Kotlin Multiplatform & Compose Multiplatform - Starter kit for pragmaticscarlostorres15106
 
Transcript: New from BookNet Canada for 2024: BNC CataList - Tech Forum 2024
Transcript: New from BookNet Canada for 2024: BNC CataList - Tech Forum 2024Transcript: New from BookNet Canada for 2024: BNC CataList - Tech Forum 2024
Transcript: New from BookNet Canada for 2024: BNC CataList - Tech Forum 2024BookNet Canada
 
Connect Wave/ connectwave Pitch Deck Presentation
Connect Wave/ connectwave Pitch Deck PresentationConnect Wave/ connectwave Pitch Deck Presentation
Connect Wave/ connectwave Pitch Deck PresentationSlibray Presentation
 

Último (20)

Commit 2024 - Secret Management made easy
Commit 2024 - Secret Management made easyCommit 2024 - Secret Management made easy
Commit 2024 - Secret Management made easy
 
SIP trunking in Janus @ Kamailio World 2024
SIP trunking in Janus @ Kamailio World 2024SIP trunking in Janus @ Kamailio World 2024
SIP trunking in Janus @ Kamailio World 2024
 
My INSURER PTE LTD - Insurtech Innovation Award 2024
My INSURER PTE LTD - Insurtech Innovation Award 2024My INSURER PTE LTD - Insurtech Innovation Award 2024
My INSURER PTE LTD - Insurtech Innovation Award 2024
 
What's New in Teams Calling, Meetings and Devices March 2024
What's New in Teams Calling, Meetings and Devices March 2024What's New in Teams Calling, Meetings and Devices March 2024
What's New in Teams Calling, Meetings and Devices March 2024
 
Story boards and shot lists for my a level piece
Story boards and shot lists for my a level pieceStory boards and shot lists for my a level piece
Story boards and shot lists for my a level piece
 
Developer Data Modeling Mistakes: From Postgres to NoSQL
Developer Data Modeling Mistakes: From Postgres to NoSQLDeveloper Data Modeling Mistakes: From Postgres to NoSQL
Developer Data Modeling Mistakes: From Postgres to NoSQL
 
"Federated learning: out of reach no matter how close",Oleksandr Lapshyn
"Federated learning: out of reach no matter how close",Oleksandr Lapshyn"Federated learning: out of reach no matter how close",Oleksandr Lapshyn
"Federated learning: out of reach no matter how close",Oleksandr Lapshyn
 
SAP Build Work Zone - Overview L2-L3.pptx
SAP Build Work Zone - Overview L2-L3.pptxSAP Build Work Zone - Overview L2-L3.pptx
SAP Build Work Zone - Overview L2-L3.pptx
 
Bun (KitWorks Team Study 노별마루 발표 2024.4.22)
Bun (KitWorks Team Study 노별마루 발표 2024.4.22)Bun (KitWorks Team Study 노별마루 발표 2024.4.22)
Bun (KitWorks Team Study 노별마루 발표 2024.4.22)
 
"Subclassing and Composition – A Pythonic Tour of Trade-Offs", Hynek Schlawack
"Subclassing and Composition – A Pythonic Tour of Trade-Offs", Hynek Schlawack"Subclassing and Composition – A Pythonic Tour of Trade-Offs", Hynek Schlawack
"Subclassing and Composition – A Pythonic Tour of Trade-Offs", Hynek Schlawack
 
New from BookNet Canada for 2024: BNC CataList - Tech Forum 2024
New from BookNet Canada for 2024: BNC CataList - Tech Forum 2024New from BookNet Canada for 2024: BNC CataList - Tech Forum 2024
New from BookNet Canada for 2024: BNC CataList - Tech Forum 2024
 
Advanced Test Driven-Development @ php[tek] 2024
Advanced Test Driven-Development @ php[tek] 2024Advanced Test Driven-Development @ php[tek] 2024
Advanced Test Driven-Development @ php[tek] 2024
 
DevEX - reference for building teams, processes, and platforms
DevEX - reference for building teams, processes, and platformsDevEX - reference for building teams, processes, and platforms
DevEX - reference for building teams, processes, and platforms
 
Vertex AI Gemini Prompt Engineering Tips
Vertex AI Gemini Prompt Engineering TipsVertex AI Gemini Prompt Engineering Tips
Vertex AI Gemini Prompt Engineering Tips
 
Unleash Your Potential - Namagunga Girls Coding Club
Unleash Your Potential - Namagunga Girls Coding ClubUnleash Your Potential - Namagunga Girls Coding Club
Unleash Your Potential - Namagunga Girls Coding Club
 
The Future of Software Development - Devin AI Innovative Approach.pdf
The Future of Software Development - Devin AI Innovative Approach.pdfThe Future of Software Development - Devin AI Innovative Approach.pdf
The Future of Software Development - Devin AI Innovative Approach.pdf
 
Install Stable Diffusion in windows machine
Install Stable Diffusion in windows machineInstall Stable Diffusion in windows machine
Install Stable Diffusion in windows machine
 
Kotlin Multiplatform & Compose Multiplatform - Starter kit for pragmatics
Kotlin Multiplatform & Compose Multiplatform - Starter kit for pragmaticsKotlin Multiplatform & Compose Multiplatform - Starter kit for pragmatics
Kotlin Multiplatform & Compose Multiplatform - Starter kit for pragmatics
 
Transcript: New from BookNet Canada for 2024: BNC CataList - Tech Forum 2024
Transcript: New from BookNet Canada for 2024: BNC CataList - Tech Forum 2024Transcript: New from BookNet Canada for 2024: BNC CataList - Tech Forum 2024
Transcript: New from BookNet Canada for 2024: BNC CataList - Tech Forum 2024
 
Connect Wave/ connectwave Pitch Deck Presentation
Connect Wave/ connectwave Pitch Deck PresentationConnect Wave/ connectwave Pitch Deck Presentation
Connect Wave/ connectwave Pitch Deck Presentation
 

Git and GitHub: Lifting ourselves out of SVN

  • 1. Git and GitHub Lifting ourselves out of SVN Sebastiaan Deckers November 2011
  • 2. What's wrong with SVN? Git is just better.
  • 3. http:// Why Git Is Better Than X .com/ Features Workflow ● Cheap Local ● Subversion-Style Branching Workflow ● Everything is Local ● Integration ● Git is Fast Manager Workflow ● Git is Small ● Dictator and ● The Staging Area Lieutenants ● Distributed Workflow ● GitHub ● Easy to Learn
  • 4. Git clients? Windows: TortoiseGit Mac: Github.app, Tower ($59)
  • 5. Workflow Add source code files so that Git tracks them in the local repository. Commit your changed files to the local repo. Push to upload your commits to GitHub. Pull to get commits from GitHub.
  • 7. commit add push pull fetch etc... git help <command> Your friendly neighbourhood documentation.
  • 8. svn checkout <url> <dir> git clone <url> <dir> ... but wait, it's better! Full revision history No single point of failure Fast transfer speed
  • 9. svn update git pull <remote> <branch> ... but wait, it's better! Merge branches Each developer has their own remote Hack together without affecting others
  • 10. svn add git add --all ... but wait, it's better! Just kidding. It's pretty much the same. But add also used to mark merge conflicts as resolved.
  • 11. svn commit git push <remote> <branch> ... but wait, it's better! As with pull, you can push to anywhere.
  • 12. What is this I don't even...
  • 13. remote ≈ SVN repository URL A remote is a bookmark of another Git repository. It represents a Git repo by its URL. The default remote is called "origin". The origin remote has no special meaning and is merely convention.
  • 14. refspec ≈ SVN branch name A refspec is the name of a branch or tag, or the SHA-1 of a particular commit. The default refspec is called "master". The master refspec has no special meaning and is merely convention.
  • 15. commit ≈ SVN revision/commit Changes to files are identified by a SHA-1 hash. Can usually be referenced by the first few characters. Allows Git to do fast comparisions, error checking, compact storage.
  • 17. git log commit 4f94c3059851fedce2d92f19af98d67ec8c2be69 Author: Thomas Gorissen <thomas@adzcentral.com> Date: Wed Nov 2 09:23:41 2011 +0000 Changed date interpretation to adapt server change git-svn-id: https://subversion.assembla.com/svn/adz/uinew@4672 3c9e7dd8-c376-4c09-bcd8-96044d63829d
  • 18. git log --oneline 4f94c30 Changed date interpretation to adapt server change 501753c Fixing creative click tracking test cce1c63 Changing maximum bid to bid-price 23aad1c Override the aggregated status with only the primary status. 4b2f730 Increased version number to 1.5.5 84aed45 Show the filter ID when a name is missing 5ae3f2f not overriding backup picture with old one on upload 38af93b removing now unnecessary code to reference backupID 7dac9c0 Redirecting user to #Home if he doesn't accept terms 02afc23 Added ISO date parsing b30d440 Changed sessionTimeout to be understood as seconds a57adf0 Not querying for rejected creatives on select popup in CI bc4c93a Recursively apply the active selection on search results 7ad1401 Highlighting error fields on credit limit change
  • 19. git log --grep=refactoring 3b9c48e Preparations for Tree control refactoring d3f32f9 Code cleanup/ refactoring b7d58d0 Minor code refactoring 83a2235 Minor refactoring for improved trickery ba83e28 Massive refactoring of the filters control. Now supports disabling entire menu sections on-the-fly. 98e9232 Lots of refactoring to show Pending Approvals as a widget anywhere
  • 20. git log --author=seb 23aad1c Override the aggregated status with only the primary status. 6a9f696 Fixed showing the platform support dagger symbol on search results 84aed45 Show the filter ID when a name is missing 78a9948 Asynchronous rendering with a loading indicator for audience template loading/saving bc4c93a Recursively apply the active selection on search results edb35be Fixed recursive selection to activate all parents cbe9542 Removed dead code :)
  • 22. git branch List, create, or delete branches Warning: Does not switch branch! #wtfgit
  • 23. git checkout [-b] <branchname> Creates a new branch and switches to it.
  • 24. git merge <branchname> Merges branchname into the current branch.
  • 25. Branching Example http://book.git-scm. com/3_basic_branching_and_merging.html
  • 27. Commit History Who's doing what
  • 28.
  • 29. Pull Requests Code review and collaboration
  • 30.
  • 32.
  • 33. Questions? RTFM http://book.git-scm.com/ http://help.github.com/