Git Workshop
POSTS

Introduction

Alice and Bob are writers who are collaborating on a new book. They’ve decided to use Git as their tool for collaborative edition, and a very ancient computer with a model M keyboard attached to it.

Model M keyboard

To get started, they’ll need to set up a Git repository for the book. This will allow them to track changes to the book over time, collaborate on the book together, and easily merge their changes into a single version of the book.

Note: this tutorial assumes you have access to git. If it is not true, feel free to install them:

sudo apt update
sudo apt install -y git

    Quick access

    1. Introduction
    2. Alice: repo initialization
    3. Alice: first commits
    4. Alice: moving through the timeline
    5. Alice: basic branching
    6. Alice: merging without conflicts
    7. Alice: merging with conflict resolution
    8. Alice: tagging
    9. Bob: cloning repositories
    10. Bob: pushing to origin
    11. Alice: merging and log format
    12. Alice: centralized repository creation
    13. Bob: pulling
    14. Bob: recovering from errors with the reference log
    15. Bob finds the author of a typo
    16. Alice: amending commits
    17. Alice: history simplification
    18. Alice: cherry picking changesets
    19. Git Workshop Lab
    © Git Workshop 2024