search

tudelft3d / cityjson-versioning-prototype

A prototype implementation of interaction with versioned CityJSON files
MIT License
5 stars 1 forks source link

Problem on merging #12

Open Glipse opened 6 months ago

Glipse commented 6 months ago

I am trying to do the versioning with 3D model din Cityjson versioning prototype but when come to merge the latest version after editing the files to the initial commit (main) , "main is earlier than test-branch! Can't do this" come out, so i can't proceed it, below the error that come out in my screen

(project6) C:\Users\Desktop\project6\Scripts>cjv init commit "C:\Users\Desktop\project6\Scripts\v1_attribute1.json" main -a " ......." -m "Initial commit" -o new_vcityjson.json Appending vertices... Removing duplicate vertices... Updating main to 6618a10d5c513ec2b336bbdc4e9ed9b321fae85d Saving new_vcityjson.json...

(project6) C:\Users\Desktop\project6\Scripts>cjv "C:\Users\Desktop\project6\Scripts\v1_attribute1.json" branch test-branch The file provided is not a versioned CityJSON!

(project6) C:\Users\Desktop\project6\Scripts>cjv new_vcityjson.json branch test-branch Creating 'test-branch' at 6618a10d5c513ec2b336bbdc4e9ed9b321fae85d... Saving file at new_vcityjson.json... Done! Tot ziens.

(project6) C:\Users\Desktop\project6\Scripts>cjv new_vcityjson.json commit "C:\Users\Desktop\project6\Scripts\v1_attribute2v2.json" test-branch -m "Attribute Change" Provide your name: Appending vertices... Removing duplicate vertices...

Changes:

    changed: UUID_Building_1443_796119_389425 (37f200025fd731a.. -> 1c574ed8c3077ed..)

Updating test-branch to 77eb9ab312e5e6e2d087243105e4821b3345a368 Saving new_vcityjson.json...

(project6) C:\Users\Desktop\project6\Scripts>cjv new_vcityjson.json merge test-branch main Provide your name: main is earlier than test-branch! Can't do this.

problem_merge

Am I missing any steps or anything need to looking in about merge in CJV??