2020 November CodeRefinery HackMD, day 2

tags: workshop


(tentative) Name the most important thing you learned yesterday

Feedback/suggestions from yesterday

Branching and merging


What to do

  1. define git graph (https://coderefinery.github.io/git-intro/06-branches/#a-useful-alias)
  2. Then create a branch called experiment https://coderefinery.github.io/git-intro/06-branches/#creating-and-working-with-branches

Solution of the above ex:

  1. go to the directory you have been using yesterday (the guacamole recipe)
  2. define the graph alias: git config --global alias.graph "log --all --graph --decorate --oneline"
  3. make sure your directory is clean/ commits: git status
  4. create a new branch called experiment from master: git branch experiment master
  5. switch to the experiment branch: git checkout experiment
  6. view your branches: git branch

Excercise: (until xx:55)


Break until xx:07/

Merging branches https://coderefinery.github.io/git-intro/06-branches/#merging-branches

Merging branches on your own until: XX:22

Conflict resolution: https://coderefinery.github.io/git-intro/08-conflicts/

Create two branches as the instructor showed

Sharing repositories online


Break until xx:15

Inspecting history


Exercise until xx:55


Please give us feedback for today: one thing that you enjoyed, one thing we should change/improve:


To improve:

:::info Always ask questions at the very bottom of this document, right above this. Switch to view mode if you are only watching.

We are monitoring this hackMD, but we will reply every now and then so that you can focus on the speaker. :::