Code

Add OnConflictOptions Support#2415

Code

Open

justinp-tt wants to merge 23 commits intomastertemporalio/sdk-java:masterfrom on-conflict-optionstemporalio/sdk-java:on-conflict-optionsCopy head branch name to clipboard

+464-94

Commits

Commits on Feb 13, 2025

• Add OnConflictOptions support

  justinp-tt

  committed
  dfc901d

  Copy full SHA for dfc901d

• Add OnConflictOptions support

  justinp-tt

  committed
  85cff62

  Copy full SHA for 85cff62

Commits on Feb 14, 2025

• Add OnConflictOptions support

  justinp-tt

  committed
  1a6be22

  Copy full SHA for 1a6be22

• Add OnConflictOptions support

  justinp-tt

  committed
  5f08c48

  Copy full SHA for 5f08c48

• Add OnConflictOptions support

  justinp-tt

  committed
  5bfb3e5

  Copy full SHA for 5bfb3e5

Commits on Feb 19, 2025

• Add OnConflictOptions support

  justinp-tt

  committed
  47cd098

  Copy full SHA for 47cd098

• Add OnConflictOptions support

  justinp-tt

  committed
  3896f3d

  Copy full SHA for 3896f3d

Commits on Feb 21, 2025

• Update temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowMutableStateImpl.java

  Show description for 6d6345e
  

  justinp-tt

  and

  rodrigozhou

  authored
  6d6345e

  Copy full SHA for 6d6345e

Commits on Feb 24, 2025

• Add OnConflictOptions support

  justinp-tt

  committed
  ca8f3d5

  Copy full SHA for ca8f3d5

• Add OnConflictOptions support

  justinp-tt

  committed
  b56db56

  Copy full SHA for b56db56

• Merge branch 'master' into on-conflict-options

  justinp-tt

  committed
  9151216

  Copy full SHA for 9151216

• Add OnConflictOptions support

  justinp-tt

  committed
  6c25aec

  Copy full SHA for 6c25aec

• Add OnConflictOptions support

  justinp-tt

  committed
  74aada4

  Copy full SHA for 74aada4

• Add OnConflictOptions support

  justinp-tt

  committed
  0d5b919

  Copy full SHA for 0d5b919

• Add OnConflictOptions support

  justinp-tt

  committed
  81f9ec4

  Copy full SHA for 81f9ec4

• Add OnConflictOptions support

  justinp-tt

  committed
  c6b9925

  Copy full SHA for c6b9925

Commits on Feb 25, 2025

• fixes

  rodrigozhou

  committed
  44f562e

  Copy full SHA for 44f562e

Commits on Feb 27, 2025

• Merge branch 'master' into on-conflict-options

  rodrigozhou

  committed
  8158ab0

  Copy full SHA for 8158ab0

Commits on Feb 28, 2025

• tests

  rodrigozhou

  committed
  35bbf02

  Copy full SHA for 35bbf02

• fix callbacks in describe and continue as new

  rodrigozhou

  committed
  86ff638

  Copy full SHA for 86ff638

• unblock UseExisting

  rodrigozhou

  committed
  1e69607

  Copy full SHA for 1e69607

Commits on Mar 3, 2025

• fix tests

  rodrigozhou

  committed
  a507b5e

  Copy full SHA for a507b5e

Commits on Mar 4, 2025

• revert unblock UseExisting

  rodrigozhou

  committed
  e3ae76a

  Copy full SHA for e3ae76a