v2.0.2

2.0.2 (2023-09-13)

Dependency updates

• deps: bump actions/checkout from 3 to 4 (84c036b)

v2.0.1

2.0.1 (2022-10-15)

Bug Fixes

• set correct default value for option resolve_conflicts (e9d8fbc)

v2.0.1-beta.1

2.0.1-beta.1 (2022-10-15)

Bug Fixes

• set correct default value for option resolve_conflicts (e9d8fbc)

v1.2.3

1.2.3 (2022-10-12)

Bug Fixes

• only checkout target for strategy merge (ff6b38c)

v2.0.0

2.0.0 (2022-10-11)

⚠ BREAKING CHANGES

• default behaviour for merge conflict changes

Merge conflicts are now resolved using strategy option ours by default, forcing conflicts to be auto-resolved cleanly by favoring the target version. All non-conflicting changes are still reflected in the merge result.

Set input resolve_conflicts to false to restore the previous behaviour of failing if any merge conflicts occur.

Features

• add option to automatically resolve merge conflicts (d7daf16)

Bug Fixes

• only checkout target for strategy merge (59149dd)

v2.0.0-beta.2

2.0.0-beta.2 (2022-10-11)

Bug Fixes

• only checkout target for strategy merge (59149dd)

v2.0.0-beta.1

2.0.0-beta.1 (2022-10-11)

⚠ BREAKING CHANGES

• default behaviour for merge conflict changes

Merge conflicts are now resolved using strategy option ours by default, forcing conflicts to be auto-resolved cleanly by favoring the target version. All non-conflicting changes are still reflected in the merge result.

Set input resolve_conflicts to false to restore the previous behaviour of failing if any merge conflicts occur.

Features

• add option to automatically resolve merge conflicts (d7daf16)

v1.2.2

1.2.2 (2022-10-10)

Bug Fixes

• don't checkout target for strategy force (e1d4653)

v1.2.2-beta.1

1.2.2-beta.1 (2022-10-10)

Bug Fixes

• don't checkout target for strategy force (e1d4653)

v1.2.1

1.2.1 (2022-08-26)

Dependency updates

• deps: bump actions/checkout from 2 to 3 (30dacb9)