Repository navigation

V2 pull integration - #296

Merged

MarcelGeo merged 41 commits into

masterfrom

v2-pull-integration

May 11, 2026

Commits on Dec 8, 2025
- Initial dirty version of v2 pull integration + porject info v2
  MarcelGeo
  committed
  2220abc
Commits on Dec 9, 2025
- Separate diff files from merge files + comments @wonder-sk
  MarcelGeo
  committed
  001c83d
Commits on Dec 16, 2025
- Introduce:
  MarcelGeo
  committed
  68b84c1
Commits on Dec 18, 2025
- Added return types fo new functions
  MarcelGeo
  committed
  ae3e55c
- Fix test test_mergin_project
  MarcelGeo
  committed
  55d9e5a
- add optional download_path for pattern with diff files
  MarcelGeo
  committed
  db7be6c
- solve base file missing
  MarcelGeo
  committed
  8e3f2ec
- Handle unfinished pull
  MarcelGeo
  committed
  9552372
Commits on Jan 16, 2026
- comments @varmar05
  MarcelGeo
  committed
  fc90173
- fix files to merge renamig
  MarcelGeo
  committed
  411d3e1
- fix download base files + import
  MarcelGeo
  committed
  5e2eccc
Commits on Jan 19, 2026
- fix for is_gpgkg_open results
  MarcelGeo
  committed
  5891088
- update tests for cases where geopackage is modified
  MarcelGeo
  committed
  9a18374
- Black 26.1.0 upgrades
  MarcelGeo
  committed
  9c82771
- Add debug to gitignore
  MarcelGeo
  committed
  7ff4c5f
- Merge remote-tracking branch 'origin/master' into v2-pull-integration
  MarcelGeo
  committed
  2bca5bd
- Merge remote-tracking branch 'origin/v2-pull-integration' into pull-initial
  MarcelGeo
  committed
  7a144b1
- fixed imports after merge
  MarcelGeo
  committed
  ec500a5
- pull actions tests
  MarcelGeo
  committed
  7fb335f
Commits on Feb 12, 2026
- First comments resolving from a reviews
  MarcelGeo
  committed
  93995ec
Commits on Feb 27, 2026
- Update mergin/test/test_client_pull.py
  
  MarcelGeo
  and
  Copilot
  authored
  3a1f47f
- Update mergin/common.py
  
  MarcelGeo
  and
  Copilot
  authored
  be1ffed
- Update mergin/merginproject.py
  
  MarcelGeo
  and
  Copilot
  authored
  337757f
- Apply suggestions from code review
  
  MarcelGeo
  and
  Copilot
  authored
  d1585fb
- Address comments @wonder-sk
  MarcelGeo
  committed
  c3dd5ec
- Fix arguments of pull changes
  MarcelGeo
  committed
  f6aea66
- Fix rest of tests
  MarcelGeo
  committed
  e4afd04
- Fix renamed missing key
  MarcelGeo
  committed
  a41258a
Commits on Mar 4, 2026
- Merge remote-tracking branch 'origin/master' into v2-pull-integration
  MarcelGeo
  committed
  f326179
- Merge remote-tracking branch 'origin/v2-pull-integration' into pull-initial
  MarcelGeo
  committed
  9f89e3f
- Fix tests for new test_case
  MarcelGeo
  committed
  80c371c
- use username instead of API_USER variable in test
  MarcelGeo
  committed
  ee87ad9
Commits on Mar 5, 2026
- For server response with update:
  MarcelGeo
  committed
  37692a8
- Merge pull request #282 from MerginMaps/pull-initial
  MarcelGeo
  authored
  3dd6637
Commits on Apr 20, 2026
- Adapt copy conflict changes
  MarcelGeo
  committed
  edbf0bd
- Handle None in local change
  MarcelGeo
  committed
  db29609
Commits on Apr 21, 2026
- Update typing
  MarcelGeo
  committed
  dda0e3b
- Merge pull request #295 from MerginMaps/copy_conflict_checksums
  MarcelGeo
  authored
  883e655
Commits on May 4, 2026
- Patch project info version before to be compatible with files_at_version parameter
  
  MarcelGeo
  and
  Copilot
  committed
  422754e
- Merge pull request #297 from MerginMaps/project_info_version
  MarcelGeo
  authored
  548ec73
Commits on May 11, 2026
- Merge remote-tracking branch 'origin/master' into v2-pull-integration
  MarcelGeo
  committed
  7f4497d

Commits

Commits on Dec 8, 2025

Commits on Dec 9, 2025

Commits on Dec 16, 2025

Commits on Dec 18, 2025

Commits on Jan 16, 2026

Commits on Jan 19, 2026

Commits on Feb 12, 2026

Commits on Feb 27, 2026

Commits on Mar 4, 2026

Commits on Mar 5, 2026

Commits on Apr 20, 2026

Commits on Apr 21, 2026

Commits on May 4, 2026

Commits on May 11, 2026