Code

Harry: Merge conflict test#6

Code

Open

tczhu-sh wants to merge 5 commits intomainChris-Wang/jrdevopsrepo:mainfrom feature-harryChris-Wang/jrdevopsrepo:feature-harryCopy head branch name to clipboard

+6-7

Commits

Commits on May 11, 2021

• Harry: Merge conflict test

  tczhu-sh

  committed
  64bb181

  Copy full SHA for 64bb181

• Harry: merge test 2

  tczhu-sh

  committed
  15c1aa6

  Copy full SHA for 15c1aa6

• Third conflict

  tczhu-sh

  committed
  cfb6d28

  Copy full SHA for cfb6d28

• Fourth conflict attempt

  tczhu-sh

  committed
  146d3ce

  Copy full SHA for 146d3ce

Commits on May 12, 2021

• Merge branch 'main' into feature-harry

  Chris-Wang

  authored
  b7d516d

  Copy full SHA for b7d516d