Code

Add conflict_resolution input#417

Code

Merged

korthout merged 9 commits intokorthout:mainkorthout/backport-action:mainfrom vermz99:mainvermz99/backport-action:mainCopy head branch name to clipboardMay 26, 2024

+408-50

Commits

Commits on Mar 31, 2024

• backport on conflict - initial commit

  vermz99

  committed
  87d12e0

  Copy full SHA for 87d12e0

• Added unit test for cherry-pick

  vermz99

  committed
  56b3dd4

  Copy full SHA for 56b3dd4

Commits on Apr 3, 2024

• refactor for new commit conflict_resolution flag (#12)

  Show description for 1ec3ef4
  

  AlexVermette-Eaton

  and

  vermz99

  authored
  1ec3ef4

  Copy full SHA for 1ec3ef4

• dist: build new artifacts

  Show description for 9a4d5cf
  AlexVermette-Eaton

  committed
  9a4d5cf

  Copy full SHA for 9a4d5cf

Commits on May 10, 2024

• Merge remote-tracking branch 'fork/main' - Partial support of remote-tracking with backport_on_conflicts

  AlexVermette-Eaton

  committed
  1614d7d

  Copy full SHA for 1614d7d

• Added suggestion provided in code review. Added ReadMe. Fixed action.yml default value.

  AlexVermette-Eaton

  committed
  9161072

  Copy full SHA for 9161072

Commits on May 14, 2024

• Fixed conflit commit message and replaced --force with --force-with-lease

  AlexVermette-Eaton

  committed
  0b50a9c

  Copy full SHA for 0b50a9c

Commits on May 26, 2024

• refactor: make use of default parameter

  Show description for 13c2a2b
  korthout

  committed
  13c2a2b

  Copy full SHA for 13c2a2b

• dist: build new version

  korthout

  committed
  0024721

  Copy full SHA for 0024721