Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Problem on merging #12

Open
Glipse opened this issue Feb 4, 2024 · 0 comments
Open

Problem on merging #12

Glipse opened this issue Feb 4, 2024 · 0 comments

Comments

@Glipse
Copy link

Glipse commented Feb 4, 2024

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??

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant