MerginMaps / geodiff

74%

master: 90%

LAST BUILD ON BRANCH fix-152-incorrect-rebase-conflicts

branch: fix-152-incorrect-rebase-conflicts

CHANGE BRANCH

x

Reset

• fix-152-incorrect-rebase-conflicts
• 0.2.3
• 0.2.6
• 0.4.0
• 0.5.0
• 0.5.1
• 0.6.0
• 0.6.1
• 0.6.2
• 0.6.3
• 0.6.4
• 0.6.5
• 0.7.0
• 0.7.1
• 0.7.2
• 0.7.3
• 0.7.4
• 0.7.5
• 0.7.6
• 0.7.7
• 0.8.0
• 0.8.1
• 0.8.3
• 0.8.4
• 0.8.5
• 0.8.6
• 0.8.7
• 0.8.8
• 101-non-pkey-cols
• 19-db-sync-naming-convention
• 50-support-unicode-paths
• 66-ignore-gpkg-tables
• 74-sqlite-escape-characters
• 75-gpkg-trigger-prefix
• 81-date-column
• 83-envelope-in-header
• 84-api-recreated
• 94-multi-geometries
• 96-3d-geometries
• 99-unwanted-changes-3d
• add_summary_to_py
• apply-and-create-using-drivers
• appveyor
• better-errors-master
• black
• bug/install_ios_sdk
• changeset-reader-api
• ci2
• ci_github
• clean_api
• concat-changesets
• confict_file
• copy-wal-shm-leftovers
• create-tables
• debug-macox-travis
• dependabot/github_actions/dot-github/workflows/actions/download-artifact-4.1.7
• driver_api
• dump-data
• fix-137-escape-trigger-name
• fix-138-ignore-metatables
• fix-139-better-make-copy-sqlite-errors
• fix-143-robust-datetime-handling
• fix-154-null-in-datetime
• fix-bad-rebase
• fix-datetime-comparison
• fix-diff-postgresql
• fix-double-precision
• fix-empty-geom
• fix-extra-file-left
• fix-floats-one-more
• fix-floats-take-two
• fix-postgres-ci
• fix-python-ci-crash
• fix-tests
• fix-travis-macos
• fix_11_other_tables
• fix_169_90pc_coverage
• fix_174_concat_reverse
• fix_22_rebase
• fix_24_win32
• fix_29_rebasebug
• fix_45
• fix_9_extra_tests
• fix_logger_none
• fix_rtree
• fix_win
• fk
• geodiff-wheels-dry-run
• geodiff8
• gh-publish-pypi
• install_static
• iss_136_context
• iss_165_comp_warning
• json-library
• json-summary
• json_export
• logger2
• m1apple
• mac-pyenv
• make-copy-sqlite
• make-copy-sqlite-to-postgres
• master
• mergin_integration
• more-postgres-types
• more_coverage
• new-cli
• new_python
• packages_206
• pg-data-types
• pkg-manylinux2014
• port-changes-from-release-0.8.x
• postgres-driver
• postgres-update-sequence
• py310
• py311
• pygeodiff-debug
• pypi-upload-github-ci
• python313
• rebase-ex
• rebase-new-api
• refactoring
• refactoring-improvements
• refactoring2
• refs/tags/1.0.0
• refs/tags/1.0.1
• refs/tags/1.0.2
• refs/tags/1.0.3
• refs/tags/1.0.4
• refs/tags/1.0.5
• refs/tags/1.0.6
• refs/tags/2.0.0
• refs/tags/2.0.1
• refs/tags/2.0.2
• refs/tags/2.0.3
• refs/tags/2.0.4
• release-0.8.2
• release-0.8.x
• shutdown
• skip-tables
• small_tweaks
• sqlite-driver
• sqlite-logging
• system_sqlite3
• table-schema-json
• timestamp-seconds
• unicode-fixes-0.8
• unicode-json-output
• update-fetch-dist-script
• update-pygeodiff
• without-internal-sqlite
• wkb-envelope

Fix handling of rebase when editors change the same value (fixes #152)