Giter VIP home page Giter VIP logo

rebasing-workflow's Introduction

Rebasing Workflow

You've decided to level up your Git skills and have heard that rebasing is where it's at. In this session we'll talk about: WHY rebasing can make it easier to untangle your project's history; WHEN you should use rebase; WHAT rebasing actually does to your repository; and HOW it actually looks when things go right (and how to recover when things go wrong).

Time: 45 minutes

Presented At

Earlier versions of this presentation were delivered from a keynote deck at the following events:

  • ConFoo, Montreal, 2015
  • OSCON, Portland, 2015

There may be outstanding issues from the conversion to reveal.js. See the TODO list.

Viewing the Presentation

Online:

Locally:

  • Ensure node.js and grunt are installed.
  • Install dependencies: npm install
  • Run the server: grunt serve
  • Open http://localhost:8000 to view the presentation

If style changes are made to the SCSS file, you will need to re-create the theme files.

  • Run: grunt css-themes

If you will not have an internet connection for your presentation, make sure the Google Font Open Sans Condensed is installed locally. For your convenience, it is included in the folder assets/fonts/open-sans and is licensed separately.

Branches

  • content - content files, and style sheets without the presentation software
  • upstream_reveal - the latest version of reveal.js that's being used for this presentation
  • presentation - combines the branches content and upstream_reveal; used for local testing
  • gh-pages - typically a copy of the branch presentation; used for deployments

License

Content (slides text, diagrams, and CSS theme for the slides):

Slide software (reveal.js):

Fonts (Open Sans family):

  • Copyright (C) Google
  • Apache License

rebasing-workflow's People

Contributors

emmajane avatar

Watchers

 avatar  avatar

Forkers

auobauo

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    ๐Ÿ–– Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. ๐Ÿ“Š๐Ÿ“ˆ๐ŸŽ‰

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google โค๏ธ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.