diff --git a/html_output/index.html b/html_output/index.html index afcf71a..2fced10 100644 --- a/html_output/index.html +++ b/html_output/index.html @@ -27,9 +27,9 @@ A commit contains this information:

  1. What changes hav - accepting and keeping both changes - re-editing the files to incorporate both changes

    After merging two branches, a merge commit is created. This is an exceptional commit that has two parent commits instead of one.

    Complex collaborative remote workflow

    1. You clone a repository from a remote host to your local computer.
    2. You create a new branch "my-feature" for your changes.
    3. You make your changes to the repository.
    4. You stage and commit your changes.
    5. You push your commit (and new branch) up to the remote.
    6. You pull other people's commits on this branch from the remote.
    7. Repeat steps 6, 3, 4 and 5
    8. You switch back to "main" and merge "my-feature" into it.
    9. You push your new merge commit up to the "main" branch.

    Use case: you are designing a website for a client and want to show 3 different versions of it with different background colours.

    Use case: tracking and collaborating on a repository with others such as a website project, where two online versions of the website exist, a "safe" one that is available to the public, and an "experimental" one that is reserved for trying new features together.

    Recap

    • repository: a directory initialised with git
    • commit: a checkpoint in the repository timeline(s)
    • checkout: to visit the repository at a specific commit in its history.
    • working tree: your files as they are right now in the repository
    • staging area: a place to add changes to
    • remote: a copy of the repository on a different host
    • clone: to download an identical copy of a repository
    • push: to upload local commits to a remote repository
    • pull: to re-download commits from the remote repository
    • branch: a named series of commits, a detour, a parallel timeline
    • merge: a consolidation of commits from another branch

    Install Git

    Check first:

    git --version

    If missing:

    Minimum requirement: you can run git in a terminal.

    Commands: the essentials

    • git init (initalise a repo)
    • git status (what's happening?)
    • git add (add changes to the commit)
    • git rm (remove a tracked file)
    • git commit (store changes in the repo)
    • git log (see the timeline)
    • git checkout (visit the timeline at a specific checkpoint)
    • git clone (an existing repo)
    • git push (your commits to a remote server)
    • git pull (sync with a repo online and merge)
    • git branch (take a detour)
    • git merge (merge branches)

    Command: git init

    Create a repository in the current folder. Use this when you are creating and working on your own projects.

    git init

    Creates a .git/ directory containing history + metadata.

    For the exercise we will use git clone instead of git init.

    Command: git status (your dashboard)

    git status

    Shows:

    • current branch
    • staged vs unstaged changes
    • untracked files

    Command: git add (select files)

    First, create a file

    nano index.html

    Stage files for the next commit.

    git add index.html

    Stage everything (use carefully):

    git add .

    Staging is curatorial: select what belongs together.

    Optional: git rm

    Remove a tracked file and stage the removal:

    git rm old.html
-git commit -m "Remove old page"

    For this workshop you probably will not need it.

    Command: git commit (checkpoint)

    git commit -m "Added name to my page"

    Good commit message pattern:

    • What changed
    • Why it changed (reason/intent)
    • Scope stays small

    repeat edit > stage > commit a couple times?

    Command: git log (timeline)

    git log --oneline --graph

    Gives a quick "finding aid" of earlier commits. Press 'q' to exit.

    Command: git checkout (timetravel)

    git checkout your_commit_id

    See your working tree as it would have been at a specific commit on the timeline.

    Command: git clone

    Clone (copy) a repository in the current folder. First, cd to a logical location in your computer, then:

    git clone https://git.hackersanddesigners.nl/hrk/braids
-cd braids

    Downloads a repo from the web, complete with the full commit history and all changes.

    Make edits here as you wish then stage and commit them.

    Command: git push

    Push your commits to the server, defining the remote branch to track (setting the upstream)

    git push -u origin main

    From then on, unless the remote/branch is named, git push will go in that direction.

    git push

    disabled push rights for now, only for demonstration purposes, will fail

    Command: git pull

    before we do this, one of us changes the background colour and pushes

    Pull updates from server:

    git pull

    During the exercise you mostly push your branch. -Pull is mainly for getting new changes on main (if needed).

    fact: git pull is actually a git fetch && git merge

    Command: git branch

    Choose a slug: lowercase, no spaces. This can be your name or an alias. Example: change braids/<your-slug> in the command below to braids/alex. From here on out replace <your-slug> with your chosen name.

    List branches:

    git branch

    Create a branch:

    git branch braids/<your-slug>

    Switch to branch:

    git checkout braids/<your-slug>

    Shortcut (create + switch):

    git checkout -b braids/<your-slug>

    Branches are parallel dossiers: safe space for changes.

    Forgejo: what we use today

    • Forgejo is an open-source alternative to Github
    • Forgejo hosts the central repository (remote)

    You will:

    • create an account
    • clone via HTTPS
    • push your branch

    Share your username with us so we can add you as a collaborator

    Rules for today:

    • do NOT push to main
    • create your branch under braids/<your-slug>

    Forgejo: account setup

    1. Create account at: git.hackersanddesigners.nl
    2. Confirm you can sign in

    Resources:

    Exercise overview

    You will build a (deliberately) simple page:

    • "Hi, I'm …"
    • maybe a gif?
    • a link?
    • optional: background, glitter, bad taste encouraged

    Workflow loop:

    clone -> branch -> edit -> status -> add -> commit -> push -> view -> iterate

    Exercise: step 1 (clone & branch)

    If everything went well in your initial clone & branch, check the repo with:

    git status
+git commit -m "Remove old page"

    For this workshop you probably will not need it.

    Command: git commit (checkpoint)

    git commit -m "Added name to my page"

    Good commit message pattern:

    • What changed
    • Why it changed (reason/intent)
    • Scope stays small

    repeat edit > stage > commit a couple times?

    Command: git log (timeline)

    git log --oneline --graph

    Gives a quick "finding aid" of earlier commits. Press 'q' to exit.

    Command: git checkout (timetravel)

    git checkout your_commit_id

    See your working tree as it would have been at a specific commit on the timeline.

    Command: git clone

    Clone (copy) a repository in the current folder. First, cd to a logical location in your computer, then:

    git clone https://git.hackersanddesigners.nl/hrk/braids

    That will checkout the repo into a directory /braids, go into this new directory with:

    cd braids

    You have now downloaded a repo from the web, complete with the full commit history and all changes. +Make edits here as you wish then stage and commit them.

    Command: git branch

    Choose a slug: lowercase, no spaces. This can be your name or an alias. Example: change braids/<your-slug> in the command below to braids/alex. From here on out replace <your-slug> with your chosen name.

    List branches:

    git branch

    Create a branch:

    git branch braids/<your-slug>

    Switch to branch:

    git checkout braids/<your-slug>

    Shortcut (create + switch):

    git checkout -b braids/<your-slug>

    Branches are parallel dossiers: safe space for changes.

    Command: git push

    Push your commits to the server, defining the remote branch to track (setting the upstream)

    git push -u origin main

    From then on, unless the remote/branch is named, git push will go in that direction.

    git push

    disabled push rights for now, only for demonstration purposes, will fail

    Command: git pull

    before we do this, one of us changes the background colour and pushes

    Pull updates from server:

    git pull

    During the exercise you mostly push your branch. +Pull is mainly for getting new changes on main (if needed).

    fact: git pull is actually a git fetch && git merge

    Forgejo: what we use today

    • Forgejo is an open-source alternative to Github
    • Forgejo hosts the central repository (remote)

    You will:

    • create an account
    • clone via HTTPS
    • push your branch

    Share your username with us so we can add you as a collaborator

    Rules for today:

    • do NOT push to main
    • create your branch under braids/<your-slug>

    Forgejo: account setup

    1. Create account at: git.hackersanddesigners.nl
    2. Confirm you can sign in

    Resources:

    Exercise overview

    You will build a (deliberately) simple page:

    • "Hi, I'm …"
    • maybe a gif?
    • a link?
    • optional: background, glitter, bad taste encouraged

    Workflow loop:

    clone -> branch -> edit -> status -> add -> commit -> push -> view -> iterate

    Exercise: step 1 (clone & branch)

    If everything went well in your initial clone & branch, check the repo with:

    git status
 git branch

    The first time you checkout from https://git.hackersanddesigners.nl the server will ask you for credentials. These will be remembered, so only once.

    Exercise: step 2 (edit the page)

    Edit the root index.html (and optionally style.css, assets/).

    Make a visible change first:

    • Change the name to your name (or your alias)

    Then check changes:

    git diff
 git status

    Exercise: step 3 (stage + commit)

    git add index.html
 git commit -m "Customize profile page for <your-slug>"

    If you added assets:

    git add assets/
diff --git a/slides.rst b/slides.rst
index 6801883..9381871 100644
--- a/slides.rst
+++ b/slides.rst
@@ -551,12 +551,51 @@ Clone (copy) a repository in the current folder. First, ``cd`` to a logical loca
 .. code-block:: bash
 
    git clone https://git.hackersanddesigners.nl/hrk/braids
+
+That will checkout the repo into a directory ``/braids``, go into this new directory with:
+
+.. code-block:: bash
+
    cd braids
 
-Downloads a repo from the web, complete with the full commit history and all changes.
-
+You have now downloaded a repo from the web, complete with the full commit history and all changes.
 Make edits here as you wish then stage and commit them.
 
+----
+
+Command: git branch 
+===================
+
+Choose a slug: lowercase, no spaces. This can be your name or an alias. Example: change `braids/` in the command below to `braids/alex`. From here on out replace  with your chosen name.
+
+List branches:
+
+.. code-block:: bash
+
+   git branch
+
+Create a branch:
+
+.. code-block:: bash
+
+   git branch braids/
+
+Switch to branch:
+
+.. code-block:: bash
+
+   git checkout braids/
+
+Shortcut (create + switch):
+
+.. code-block:: bash
+
+   git checkout -b braids/
+
+.. note::
+
+   Branches are parallel dossiers: safe space for changes.
+
 
 ----
 
@@ -603,43 +642,6 @@ Pull updates from server:
 
    fact: git pull is actually a git fetch && git merge
 
-
-----
-
-Command: git branch 
-===================
-
-Choose a slug: lowercase, no spaces. This can be your name or an alias. Example: change `braids/` in the command below to `braids/alex`. From here on out replace  with your chosen name.
-
-List branches:
-
-.. code-block:: bash
-
-   git branch
-
-Create a branch:
-
-.. code-block:: bash
-
-   git branch braids/
-
-Switch to branch:
-
-.. code-block:: bash
-
-   git checkout braids/
-
-Shortcut (create + switch):
-
-.. code-block:: bash
-
-   git checkout -b braids/
-
-.. note::
-
-   Branches are parallel dossiers: safe space for changes.
-
-
 ----
 
 Forgejo: what we use today