Pinned Loading

1. Rebase/Fixup Guide Rebase/Fixup Guide

   1

   # Rebasing, Fixup Commits, and Autosquashing

   2

   ## Rebasing

   3

   Rebasing is the act of taking a git branch which was taken from a given commit in the history and moving it to be branched off a different commit. This is done in short by taking all commits after the branch event and playing them on top of other commits. Depending on what files changed in the diff there may or may not be collisions which require manual resolution.

   4

   5

   ### A Graphical Example

2. config-files config-files Public

   Lua

3. coursera coursera Public

   Coursera course code from ~2016

   Python

4. koans koans Public

   Ruby

5. rarwe rarwe Public

   JavaScript

6. setback-game setback-game Public

   Python