Skip to content

v2.0.0

Marketplace
Marketplace
Compare
Choose a tag to compare
@jojomatik-bot jojomatik-bot released this 11 Oct 20:51
· 12 commits to main since this release
v2.0.0
a8f60fa
This commit was signed with the committer’s verified signature.
jojomatik jojomatik
GPG key ID: E0E051921076EF79
Learn about vigilant mode.

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)
Assets 2
Loading