Commits · master · Dimitri Leurs / git-merging-guide

Mar 03, 2020
- Readme first shot · baa097c7
  Leurs Dimitri authored 5 years ago
  
  baa097c7
- Without diff.txt, like commit 485a42eb · 4c37c5de
  Leurs Dimitri authored 5 years ago
  
  4c37c5de
- Going back one commit behind · 51a4a8d7
  Leurs Dimitri authored 5 years ago
  
  51a4a8d7
- Testing (you don't know but containing a bug) · 810fba75
  Leurs Dimitri authored 5 years ago
  
  810fba75
- Merge conflict solved, accept current change · 485a42eb
  Leurs Dimitri authored 5 years ago
  
  485a42eb
Mar 02, 2020
- Flavour master feature 2 · c6d11e8c
  Leurs Dimitri authored 5 years ago
  
  c6d11e8c
- Flavour Feature · 9478a791
  Leurs Dimitri authored 5 years ago
  
  9478a791
- Feature 1 · a5ac54e5
  Leurs Dimitri authored 5 years ago
  
  a5ac54e5
- first commit · a9cd07bc
  Leurs Dimitri authored 5 years ago
  
  a9cd07bc