hrk/Braid-slides
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

added complex collaborative workflow with branching

Browse source
This commit is contained in:
كارل مبارك 2026-01-14 11:09:40 +01:00
parent e75282a915
commit a573ea27f4
3 changed files with 74 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
html_output/2026-01-14_km.html Normal file
View file

File diff suppressed because one or more lines are too long

26
html_output/index.html
View file

File diff suppressed because one or more lines are too long

24
slides.rst
View file

@ -22,9 +22,10 @@ Braids - Intro to git
Planning (90 min)
=================
1. Context: what git is, what it does, who uses it (10 min)
2. Install Git (10 min)
3. Core concepts + core commands (20 min)
1. Context: what git is, what it does, who uses it (5 min)
2. Core concepts: commits & three areas (15 min)
3. Install Git (10 min)
2. Core concepts: branching & merging (15 min)
4. Forgejo: accounts + clone/push permissions (10 min)
5. Exercise: branch a page, publish live, iterate (35 min)
6. Wrap-up: good practices + next steps (5 min)
@ -284,6 +285,23 @@ Use case: tracking and collaborating on a repository with others such as a websi
----
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 (upload) your commit up to the remote, publishing your branch for others to see / work on.
6. You pull (re-download) other people's commits from the remote.
7. Repeat steps **6**, **3**, **4** and **5**
8. When ready, you switch back to "main" branch and merge "my-feature" branch into it.
9. You push your new merge commit up to the "main" branch on remote.
Use case: tracking and collaborating on a repository with others such as a website project, where multiple features and parrallel versions of the website exist.
----
Workshop outcome
================