Code

Task/resolve conflict#86

Code

Open

MichalSujkowski wants to merge 20 commits intonerdbord:task/resolve-conflictnerdbord/git-mastery-workshop:task/resolve-conflictfrom MichalSujkowski:task/resolve-conflictMichalSujkowski/git-mastery-workshop:task/resolve-conflictCopy head branch name to clipboard

+85

Commits

Commits on Jun 11, 2023

• feat: add important file

  Sumick

  committed
  a6f443f

  Copy full SHA for a6f443f

• feat: add second file

  Sumick

  committed
  ac4c4cf

  Copy full SHA for ac4c4cf

• chore: remove file

  Sumick

  committed
  6e2f3cb

  Copy full SHA for 6e2f3cb

• chore: add readme

  Sumick

  committed
  15a8419

  Copy full SHA for 15a8419

• chore: update readme

  Sumick

  committed
  288e556

  Copy full SHA for 288e556

• chore: add gitignore

  Sumick

  committed
  f4feaa4

  Copy full SHA for f4feaa4

Commits on Jun 17, 2023

• Merge branch 'main' of https://github.com/nerdbord/git-mastery-workshop into task/revert-commit

  Sumick

  committed
  f9d8e01

  Copy full SHA for f9d8e01

Commits on Sep 20, 2023

• added new file

  MichalSujkowski

  committed
  2cf7d47

  Copy full SHA for 2cf7d47

• Merge pull request #1 from MichalSujkowski/feat/add-new-file

  Show description for dbbd00c
  MichalSujkowski

  authored
  dbbd00c

  Copy full SHA for dbbd00c

• Revert "chore: remove file"

  Show description for 8471e97
  MichalSujkowski

  committed
  8471e97

  Copy full SHA for 8471e97

• Merge pull request #2 from MichalSujkowski/task/revert-commit

  Show description for 6d2dd15
  MichalSujkowski

  authored
  6d2dd15

  Copy full SHA for 6d2dd15

• New commit message

  

  Sumick

  authored and

  MichalSujkowski

  committed
  d08cce4

  Copy full SHA for d08cce4

• Merge pull request #3 from MichalSujkowski/task/change-commit-name

  Show description for 53ce266
  MichalSujkowski

  authored
  53ce266

  Copy full SHA for 53ce266

• chore: squash me 1

  Show description for 66c8848
  

  Sumick

  authored and

  MichalSujkowski

  committed
  66c8848

  Copy full SHA for 66c8848

• chore: remove .idea/workspace

  MichalSujkowski

  committed
  243d9e2

  Copy full SHA for 243d9e2

• Merge pull request #4 from MichalSujkowski/task/squash-commits

  Show description for c838664
  MichalSujkowski

  authored
  c838664

  Copy full SHA for c838664

• new way

  MichalSujkowski

  committed
  c1e59da

  Copy full SHA for c1e59da

• Merge pull request #5 from MichalSujkowski/task/squash-commits

  Show description for 136577c
  MichalSujkowski

  authored
  136577c

  Copy full SHA for 136577c

• Merge branch 'main' of https://github.com/MichalSujkowski/git-mastery-workshop into task/resolve-conflict

  MichalSujkowski

  committed
  4267a84

  Copy full SHA for 4267a84

• new

  MichalSujkowski

  committed
  6c0eea6

  Copy full SHA for 6c0eea6