Code

Lab resolving git conflicts - Martijn#1

Code

Open

martijnooo wants to merge 5 commits intoironhack-labs:mainironhack-labs/lab-resolving-git-conflicts:mainfrom martijnooo:lab-resolving-git-conflictsmartijnooo/lab-resolving-git-conflicts:lab-resolving-git-conflictsCopy head branch name to clipboard

+7-6

Commits

Commits on Jan 22, 2025

• Only a small adjustment

  martijnooo

  committed
  fa67932

  Copy full SHA for fa67932

• Now with personal information

  martijnooo

  committed
  acadcf3

  Copy full SHA for acadcf3

• conflict resolved

  martijnooo

  committed
  823117c

  Copy full SHA for 823117c

Commits on Jan 24, 2025

• This is a deafult file to test resolving conflicts

  martijnooo

  committed
  f9ebe2a

  Copy full SHA for f9ebe2a

• Delte unwanted file

  martijnooo

  committed
  1c0b937

  Copy full SHA for 1c0b937