Git and Github

Total Page:16

File Type:pdf, Size:1020Kb

Git and Github Git and GitHub Working Dir/Staging, Local/Remote, Clone, Push, Pull, Branch/Merge, Monorepo, GitHub Desktop Source code is by far the most important asset any Even if not using GitHub for their own source, app software company owns. It is more valuable than developers still need to get familiar with it as most of buildings, brand names, computer hardware, furniture today’s popular open source projects are using it and or anything else a software company has. Source code app developers will invariably need to use these. needs to be valued and treated like the very important company asset that it is. Hence the need for a robust This course covers both and helps developers gain source code management system. hands-on experience in how to incorporate both into their development workflow. Many Git-related terms Git is the most popular source code management have entered the developer lexicon – push, pull request, system; GitHub.com is the most popular Git cloud cloning, forking, promoting, repo – and this course hosting solution. Either Git alone or Git and GitHub can helps attendees understand each concept and mentally be used to comprehensively manage and protect source. tie everything together to see how they work in unison. Contents of One-Day Training Course Distributed Version Control Command Line Tooling Using what you might already know Porcelain vs. plumbing Adding distributed influence Beyond the basics - more complete look at Organizing teams via Git advanced command line tools for Git Strategies for managing source trees Managing as part of Toolchain Target Audience Terminology - push / pull, clone, fork, Git as part of toolchain Software engineers and fetch, branching and merging Use with other tools architects wishing to Lifecycle of a single line of code Call via scripting (automated test runs, correctly manage valuable Getting Started With Git linting, Continuous Integration/Continuous source trees Installing and configuration Delivery - CI/CD) Simple usage What to do with generated info We explore where source can be stored Monorepo (local and remote) Each project need not exist in separate repo Promoting from working dir to staging Multiple projects can be placed in a single and beyond repository – known as a monorepo What happens during a commit Practical ideas for using monorepos Prerequisites Working Locally GitHub Programming knowledge Init vs. clone Source repositories in the cloud and some previous File system layout Public (free hosting) & private (fee-paying) hands-on experience of The .gitignore file Organizations and teams any source control system. Creating, modifying and deleting locally Interacting with open source projects Cancel changes (revert) (issues, releases, changelog, pull requests) For the GitHub part of the Logging/history/status GitHub Desktop course, each attendee will Branching / Merging Enhanced (Electron-based) GUI to need their own (free) Creating and listing branches comprehensively manage Git repositories GitHub login to complete Merging a branch Easy to set up and use the lab work. Change tracking / diff / Rebase Git Internals Feature branches vs. trunk development The source code for Git itself is an Remote interesting read: https://github.com/git/git Remote protocols What can we learn from exploring it? Connecting to remote repo servers Project Push and pull commands Organizing a large source tree using Git Fetch command Deciding on project and repo layout.
Recommended publications
  • I Don T Handle Protocol Git Clone Https
    I Don T Handle Protocol Git Clone Https Ne'er-do-well Rollins curtails or show-card some herbarium invectively, however combinative Tremain sibilate vernacularly or exposing. Neogene and defrayable Noach skiatron some Nepal so labially! Niall still dribble centripetally while earless Urbano tack that self-praise. Ie i clone feature branch to the central master and send anything related to the book No idiot that possibility of. You git protocol to gits fault of http server certificate to! Please use git clone name to handle merges that http revision for software stack overflow for most time? Security and cloning is. The issues I authorize are declare just reset and pull. Tight coupling of git protocol improvements to handle extremely picky and cloning the difference: understanding the internet line option only get help! Called at night after the origin had a mechanism when someone to the turnover rate of something that many contributors. Each breast should highlight a living purpose you should completely implement general purpose. DVCS _is_ a similar system update a VCS due procedure the Distributed features. It clasp the exact same error. Because Git documentation tends to focus entirely on the relationship between actually working directory but your local repository. No, I start not associated with the product in mind way. There are now world metrics that scholarship be applied to vehicle how useable a particular interface is. This batter be concern if those use although other fund the windows explorer or home you get problems with the context menu displaying incorrectly. Open source developer who created because git protocol you to handle those like best practices that http proxy by cloning from the https can be handled that? Collaboration in git protocol.
    [Show full text]
  • Introduction to Version Control with Git
    Warwick Research Software Engineering Introduction to Version Control with Git H. Ratcliffe and C.S. Brady Senior Research Software Engineers \The Angry Penguin", used under creative commons licence from Swantje Hess and Jannis Pohlmann. March 12, 2018 Contents 1 About these Notes1 2 Introduction to Version Control2 3 Basic Version Control with Git4 4 Releases and Versioning 11 Glossary 14 1 About these Notes These notes were written by H Ratcliffe and C S Brady, both Senior Research Software Engineers in the Scientific Computing Research Technology Platform at the University of Warwick for a series of Workshops first run in December 2017 at the University of Warwick. This document contains notes for a half-day session on version control, an essential part of the life of a software developer. This work, except where otherwise noted, is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Li- cense. To view a copy of this license, visit http://creativecommons.org/ licenses/by-nc-nd/4.0/. The notes may redistributed freely with attribution, but may not be used for commercial purposes nor altered or modified. The Angry Penguin and other reproduced material, is clearly marked in the text and is not included in this declaration. The notes were typeset in LATEXby H Ratcliffe. Errors can be reported to [email protected] 1.1 Other Useful Information Throughout these notes, we present snippets of code and pseudocode, in particular snippets of commands for shell, make, or git. These often contain parts which you should substitute with the relevant text you want to use.
    [Show full text]
  • State of Microservices 2020 Authors Table of Patryk Mamczur Editor in Chief
    THE NEW STANDARD FOR BUILDING SCALABLE SOFTWARE? State of Microservices 2020 Authors _Table of Patryk Mamczur Editor in Chief Tomasz Czechowski contents Mateusz Mól Mariusz Nowak Design of online version Design of print version Developers 01 669 microservice experts from around the world 06 Maturity 02 Great architecture for solving scalability issues 12 Programming languages 03 JavaScript and TypeScripts rule all 20 Deployment and serverless 04 Microservice developers choose AWS 26 Repositories 05 Monorepo or multirepo? 32 Experts Varia Marek Gajda Adam Polak CTO of The Software House Head of Node.js Team 06 Communication, authorisation, message brokers 38 at The Software House Yan Cui Peter Cooper Continuous integration Host of Real World The Founder of Cooperpress 07 Microservices + CI = <3 42 Serverless Podcast Ewelina Wilkosz Thomas Boltze Debugging IT Consultant at Praqma CTO of Asto Digital 08 Are logs enough for your project? 48 Sarup Banskota Luca Mezzalira Head of Growth at ZEIT VP of Architecture at DAZN Consumption of APIs 09 Is static the future? 54 Richard Rodger CEO of Voxgig Micro frontends 10 Time for the microservice revolution on frontend? 60 Future Published in 2020 Ver. 1.0 11 Microservices – the new backend architecture standard 66 How many IT experts filled in the survey? Total answers: 669 252 163 Western Europe Eastern Europe 96 49 North America South and East Asia 23 24 Central and Middle East South America 40 22 Other Australia and 4 New Zealand 5 01 _develo- 01 pers 669 microservice experts from around the world 6 7 Microservice architecture – an architectural style where your application is based on a collection of fine-grained, interconnected services – is definitely a hot thing right now.
    [Show full text]
  • Microservices and Monorepos
    Microservices and Monorepos Match made in heaven? Sven Erik Knop, Perforce Software Overview . Microservices refresher . Microservices and versioning . What are Monorepos and why use them? . These two concepts seem to contradict – why mix them together? . The magic of narrow cloning . A match made in heaven! 2 Why Microservices? . Monolithic approach: App 3 Database Microservices approach . Individual Services 4 DB DB Database Versioning Microservices . Code . Executables and Containers . Configuration . Natural choice: individual repositories for each service Git . But: • Security • Visibility • Refactoring • Single change id to rule them all? 5 Monorepo . Why would you use a monorepo? . Who is using monorepos? . How would you use a monorepo? 6 Monorepos: Why would you do this? . Single Source of Truth for all projects . Simplified security . Configuration and Refactoring across entire application . Single change id across all projects . Examples: • Google, Facebook, Twitter, Salesforce, ... 7 Single change across projects change 314156 8 Monorepos: Antipatterns User workspace User workspace 9 Monorepos – view mapping User workspace . Map one or more services . Users only access files they need . Simplified pushing of changes 10 What does this have to do with Git? . Git does not support Monorepos • Limitations on number and size of files, history, contributing users • Companies have tried and failed . Android source spread over a thousand Git repositories • Requires repo and gerrit to work with 11 How can we square this circle? https://en.wikipedia.org/wiki/Squaring_the_circle 12 Narrow cloning! . Clone individual projects/services . Clone a group of projects into a single repo 13 Working with narrowly cloned repos . Users work normally in Git . Fetch and push changes from and to monorepo .
    [Show full text]
  • Version Control – Agile Workflow with Git/Github
    Version Control – Agile Workflow with Git/GitHub 19/20 November 2019 | Guido Trensch (JSC, SimLab Neuroscience) Content Motivation Version Control Systems (VCS) Understanding Git GitHub (Agile Workflow) References Forschungszentrum Jülich, JSC:SimLab Neuroscience 2 Content Motivation Version Control Systems (VCS) Understanding Git GitHub (Agile Workflow) References Forschungszentrum Jülich, JSC:SimLab Neuroscience 3 Motivation • Version control is one aspect of configuration management (CM). The main CM processes are concerned with: • System building • Preparing software for releases and keeping track of system versions. • Change management • Keeping track of requests for changes, working out the costs and impact. • Release management • Preparing software for releases and keeping track of system versions. • Version control • Keep track of different versions of software components and allow independent development. [Ian Sommerville,“Software Engineering”] Forschungszentrum Jülich, JSC:SimLab Neuroscience 4 Motivation • Keep track of different versions of software components • Identify, store, organize and control revisions and access to it • Essential for the organization of multi-developer projects is independent development • Ensure that changes made by different developers do not interfere with each other • Provide strategies to solve conflicts CONFLICT Alice Bob Forschungszentrum Jülich, JSC:SimLab Neuroscience 5 Content Motivation Version Control Systems (VCS) Understanding Git GitHub (Agile Workflow) References Forschungszentrum Jülich,
    [Show full text]
  • Josh Bloch Charlie Garrod
    Principles of Software Construction: Objects, Design, and Concurrency Part 4: et cetera Toward SE in practice: DevOps and branch management Josh Bloch Charlie Garrod 17-214 1 Administrivia • Homework 6 available – Checkpoint deadline tonight – Due next Wednesday, April 29th 17-214 2 Key concepts from last Thursday • SE empirical methods: Test-driven development case study • Version and release management 17-214 3 Today: Software engineering in practice • Release management, introduction to DevOps • Choose your own adventure… • Monolithic repositories 17-214 4 Consider: timelines of traditional software development e.g., the Microsoft* OS development history Source: By Paulire - Own work, CC BY-SA 4.0, https://commons.wikimedia.org/w/index.php?curid=46634740 17-214 5 Modern Facebook release cycle (1000+ diffs / day) 17-214 6 Aside: Canary testing 17-214 7 Aside: Dark launches and A/B testing • Focuses on user response to frontend changes rather than performance of backend • Measure user response via metrics: engagement, adoption 17-214 8 Version management using feature flags https://martinfowler.com/articles/feature-toggles.html https://docs.microsoft.com/en-us/azure/devops/migrate/phase-features-with-feature-flags?view=azure-devops 17-214 9 Warning! Feature flags can be dangerous Knight Capital Group realized a $460 million loss in 45-minutes, going from being the largest trader in US equities to bankruptcy. https://dougseven.com/2014/04/17/knightmare-a-devops-cautionary-tale/ 17-214 10 Configuration management in the modern world Deployment
    [Show full text]
  • Create a Pull Request in Bitbucket
    Create A Pull Request In Bitbucket Waverley is unprofitably bombastic after longsome Joshuah swings his bentwood bounteously. Despiteous Hartwell fathomsbroaches forcibly. his advancements institutionalized growlingly. Barmiest Heywood scandalize some dulocracy after tacit Peyter From an effect is your own pull remote repo bitbucket create the event handler, the bitbucket opens the destination branch for a request, if i am facing is Let your pet see their branches, commit messages, and pull requests in context with their Jira issues. You listen also should the Commits tab at the top gave a skill request please see which commits are included, which provide helpful for reviewing big pull requests. Keep every team account to scramble with things, like tablet that pull then got approved, when the build finished, and negotiate more. Learn the basics of submitting a on request, merging, and more. Now we made ready just send me pull time from our seven branch. Awesome bitbucket cloud servers are some nifty solutions when pull request a pull. However, that story ids will show in the grasp on all specified stories. Workzone can move the trust request automatically when appropriate or a percentage of reviewers have approved andor on successful build results. To cost up the webhook and other integration parameters, you need two set although some options in Collaborator and in Bitbucket. Go ahead but add a quote into your choosing. If you delete your fork do you make a saw, the receiver can still decline your request ask the repository to pull back is gone. Many teams use Jira as the final source to truth of project management.
    [Show full text]
  • DVCS Or a New Way to Use Version Control Systems for Freebsd
    Brief history of VCS FreeBSD context & gures Is Arch/baz suited for FreeBSD? Mercurial to the rescue New processes & policies needed Conclusions DVCS or a new way to use Version Control Systems for FreeBSD Ollivier ROBERT <[email protected]> BSDCan 2006 Ottawa, Canada May, 12-13th, 2006 Ollivier ROBERT <[email protected]> DVCS or a new way to use Version Control Systems for FreeBSD Brief history of VCS FreeBSD context & gures Is Arch/baz suited for FreeBSD? Mercurial to the rescue New processes & policies needed Conclusions Agenda 1 Brief history of VCS 2 FreeBSD context & gures 3 Is Arch/baz suited for FreeBSD? 4 Mercurial to the rescue 5 New processes & policies needed 6 Conclusions Ollivier ROBERT <[email protected]> DVCS or a new way to use Version Control Systems for FreeBSD Brief history of VCS FreeBSD context & gures Is Arch/baz suited for FreeBSD? Mercurial to the rescue New processes & policies needed Conclusions The ancestors: SCCS, RCS File-oriented Use a subdirectory to store deltas and metadata Use lock-based architecture Support shared developments through NFS (fragile) SCCS is proprietary (System V), RCS is Open Source a SCCS clone exists: CSSC You can have a central repository with symlinks (RCS) Ollivier ROBERT <[email protected]> DVCS or a new way to use Version Control Systems for FreeBSD Brief history of VCS FreeBSD context & gures Is Arch/baz suited for FreeBSD? Mercurial to the rescue New processes & policies needed Conclusions CVS, the de facto VCS for the free world Initially written as shell wrappers over RCS then rewritten in C Centralised server Easy UI Use sandboxes to avoid locking Simple 3-way merges Can be replicated through CVSup or even rsync Extensive documentation (papers, websites, books) Free software and used everywhere (SourceForge for example) Ollivier ROBERT <[email protected]> DVCS or a new way to use Version Control Systems for FreeBSD Brief history of VCS FreeBSD context & gures Is Arch/baz suited for FreeBSD? Mercurial to the rescue New processes & policies needed Conclusions CVS annoyances and aws BUT..
    [Show full text]
  • Experten-Dossier 2019
    Experten-Dossier 2019 Über 80 Seiten mit praxisorientiertem Wissen für .NET-Entwickler rund um .NET Core, Azure DevOps, TypeScript, Cosmos DB, ML.NET, Git und Azure! bastacon www.basta.net Inhalt Agile & DevOps Die DevOps-Challenge 4 DevOps-Fallstricke und wie man ihnen entkommen kann von Kevin Gerndt Microservices & APIs Warum einfach? Es geht auch komplex! 10 Entwicklung von Microservices mit Microsoft .NET von Dr. Felix Nendzig Go Git! 16 Git erobert die Entwicklerwelt von Uwe Baumann Des Kaisers neue Kleider 21 Aus VSTS wird Azure DevOps – mehr als nur ein neuer Name? von Nico Orschel und Thomas Rümmler .NET Framework & C# R. I. P .NET „Core“ 29 .NET Framework, .NET Core und Mono sind tot – lang lebe .NET 5.0! von Dr. Holger Schwichtenberg Machine Learning für die Zukunft 33 Hintergrund und Einstieg in ML mit .NET von Kevin Gerndt Architektur Kolumne: Stropek as a Service 40 Zehn Hausaufgaben für die Cloud-Architektur – Eine gute Softwarearchitektur setzt klare Ziele voraus von Rainer Stropek Große Business-Apps mit Angular meistern 43 Nachhaltige Angular-Architekturen mit Nx und Strategic Design von Manfred Steyer Inhalt Sicherheit Du kommst hier nicht rein 48 API Authorization in ASP.NET Core 3.0 mit IdentityServer von Sebastian Gingter Wasm – Ist das sicher oder kann das weg? 53 Neue Besen kehren gut, sagt man. Aber sind sie auch sicher? von Carsten Eilers HTML5 & JavaScript Das Beste aus zwei Welten 59 Mit ASP.NET Core und Angular eine Webanwendung erstellen von Fabian Gosebrink Injections für echte TypeScript-Junkies 70 Dependency
    [Show full text]
  • An Introduction to Mercurial Version Control Software
    An Introduction to Mercurial Version Control Software CS595, IIT [Doc Updated by H. Zhang] Oct, 2010 Satish Balay [email protected] Outline ● Why use version control? ● Simple example of revisioning ● Mercurial introduction - Local usage - Remote usage - Normal user workflow - Organizing repositories [clones] ● Further Information ● [Demo] What do we use Version Control for? ● Keep track of changes to files ● Enable multiple users editing files simultaneously ● Go back and check old changes: * what was the change * when was the change made * who made the change * why was the change made ● Manage branches [release versions vs development] Simple Example of Revisioning main.c File Changes File Version 0 1 2 3 Delta Simple Example Cont. main.c 0 1 2 3 makefilemain.c 0 1 Repository -1 0 1 2 3 Version Changeset Concurrent Changes to a File by Multiple Users & Subsequent Merge of Changes Line1 Line1 Line1 Line1 Line2 UserA Line2 UserA Line3 Line2 Line3 Line2 Line4 Line3 UserB Line3 Line4 Line4 UserB Line4 Initial file UserA edit UserB edit Merge edits by both users Merge tools: r-2 ● kdiff3 Branch Merge ● meld r-4 Merge types: ● 2-way r-1 ● 3-way Revision Graph r-3 Some Definitions ● Delta: a single change [to a file] ● Changeset: a collection of deltas [perhaps to multiple files] that are collectively tracked. This captures a snapshot of the current state of the files [as a revision] ● Branch: Concurrent development paths for the same sources ● Merge: Joining changes done in multiple branches into a single path. ● Repository: collection of files we intend to keep track of.
    [Show full text]
  • Git Cheat Sheet
    GIT CHEAT SHEET Git is the free and open source distributed version control system that's responsible for everything GitHub related that happens locally on your computer. This cheat sheet features the most important and commonly used Git commands for easy reference. INSTALLATION & GUIS STAGE & SNAPSHOT With platform specific installers for Git, GitHub also provides the Working with snapshots and the Git staging area ease of staying up-to-date with the latest releases of the command line tool while providing a graphical user interface for day-to-day git status interaction, review, and repository synchronization. show modified files in working directory, staged for your next commit GitHub for Windows git add [file] htps://windows.github.com add a file as it looks now to your next commit (stage) GitHub for Mac htps://mac.github.com git reset [file] unstage a file while retaining the changes in working directory For Linux and Solaris platforms, the latest release is available on the official Git web site. git diff Git for All Platforms diff of what is changed but not staged htp://git-scm.com git diff --staged diff of what is staged but not yet commited SETUP git commit -m “[descriptive message]” Configuring user information used across all local repositories commit your staged content as a new commit snapshot git config --global user.name “[firstname lastname]” set a name that is identifiable for credit when review version history git config --global user.email “[valid-email]” BRANCH & MERGE Isolating work in branches, changing context, and integrating changes set an email address that will be associated with each history marker git branch git config --global color.ui auto list your branches.
    [Show full text]
  • Version Control for Salesforce: a Practical Guide to Implementing Git-Based Release Management
    Version control for Salesforce A practical guide to implementing git-based release management Release management made easy | gearset.com Contents Introduction 2 Who is this whitepaper for? 2 A brief introduction to version control 2 Definitions 3 The path to version control 4 Production development 4 Sandbox development 5 Version control development 6 The benefits of version control in Salesforce development 6 Why don’t more Salesforce teams use version control? 8 Limitations of the first-party tooling 8 Thinking version control is only for enterprises 8 Not knowing what good looks like 8 Technical barriers of command-line tools 9 Getting started with version control: introducing Git 9 Service providers 9 On-premise vs hosted 9 A best practice development model for Salesforce 10 Overview 10 The development model 11 Branch management 12 Dealing with hotfixes 12 The hotfix model 13 What metadata to version control 14 Start with a controlled subset 14 Managed packages 15 Repository configuration 15 Finding the right deployment tool 16 For developers 16 For admins and release managers 16 For team leads and architects 17 Conclusion 17 About Gearset 17 1 Introduction Version control is one of the most powerful tools development teams can leverage on their path to effective release management, yet its adoption in the Salesforce ecosystem is surprisingly low. In this whitepaper we’ll examine how version control works, the benefits of version control over in-org development, and introduce a best-practice model for implementing version control in your business. Who is this whitepaper for? Anyone involved with the administration, development, maintenance, or management of Salesforce environments, looking for ways to improve the cadence, simplicity, reliability, and auditability of their release management.
    [Show full text]