This is an automated email from the ASF dual-hosted git repository.
sbp pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git
from 5b874ed Compute attestable metadata before starting a database
transaction
add c777bb4 Add a merge module to automatically resolve conflicts between
revisions
No new revisions were added by this update.
Summary of changes:
atr/merge.py | 255 +++++++++++++++++++++++++++++
atr/util.py | 3 +-
tests/unit/test_merge.py | 410 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 667 insertions(+), 1 deletion(-)
create mode 100644 atr/merge.py
create mode 100644 tests/unit/test_merge.py
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
