Code

Conflicts#6

Code

Open

dhia1999 wants to merge 7 commits intoalxhoff:conflictsalxhoff/git-tutorial:conflictsfrom dhia1999:conflictsdhia1999/git-tutorial:conflictsCopy head branch name to clipboard

+19-18

Commits

Commits on Apr 16, 2020

• Engineer no#1's error fixes

  alxhoff

  committed
  93fae27

  Copy full SHA for 93fae27

Commits on Oct 28, 2022

• Engineer no#2's error fixes

  

  alxhoff

  authored and

  dhia1999

  committed
  ce12557

  Copy full SHA for ce12557

• State machine not building, fixed.

  

  alxhoff

  authored and

  dhia1999

  committed
  3a50058

  Copy full SHA for 3a50058

• README for dealing with merge conflicts

  

  alxhoff

  authored and

  dhia1999

  committed
  81f70bc

  Copy full SHA for 81f70bc

Commits on Nov 3, 2022

• main file fixed and program is runnig

  dhia1999

  committed
  bc49b71

  Copy full SHA for bc49b71

• Merge remote-tracking branch 'origin/unknown_features' into conflicts

  dhia1999

  committed
  a8f0641

  Copy full SHA for a8f0641

• Code fixed and state machine is working.

  dhia1999

  committed
  89213ae

  Copy full SHA for 89213ae