Code

[No QA] Resolve CP merge conflicts#3350

Code

Merged

AndrewGable merged 6 commits intomainExpensify/App:mainfrom Rory-ResolveCPConflictsExpensify/App:Rory-ResolveCPConflictsCopy head branch name to clipboardJun 4, 2021

+22-16

Commits

Commits on Jun 3, 2021

• Create more advanced cherryPick logic and script

  roryabraham

  committed
  c43322a

• An automerge PR is any created by OSBotify, not any merged by OSBotify

  roryabraham

  committed
  232f33d

• Add better logging of the script result

  roryabraham

  committed
  6607588

• Add shebang and remove redundant variable

  roryabraham

  committed
  db31591

• Remove unnecessary square brackets and $( )

  roryabraham

  committed
  30641c1

Commits on Jun 4, 2021

• Nix script, move all the bash to the workflow

  roryabraham

  committed
  477b40e