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

Add rules and test for draft 3 to 4 schema keyword #26

Merged
merged 27 commits into from
Aug 13, 2024
Merged

Conversation

suprith-hub
Copy link
Collaborator

No description provided.

@suprith-hub suprith-hub changed the title Draft 3 to4 schema keyword Add rules and test for draft 3 to 4 schema keyword Jul 24, 2024
@suprith-hub
Copy link
Collaborator Author

@jviotti I have changed it to properties instead of $defs...

Copy link
Member

@jviotti jviotti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good but there is a git conflict. Can you resolve?

@suprith-hub
Copy link
Collaborator Author

@jviotti I am not allowed to resolve conflicts for this PR.. can you help...

@jviotti
Copy link
Member

jviotti commented Aug 12, 2024

@Era-cell What do you mean by "not allowed"? You have permissions to push on this repo (like you have been doing all along)! The typical workflow I do, in case it helps, is:

# First make sure the target of your PR, `main`, is up-to-date
$ git checkout main
$ git pull

# Go to the conflicted branch and initiate a rebase
$ git checkout draft3To4schema
$ git rebase main

# At this point, git should complain about conflicts and tell you which files are in conflict.
# You can open the conflicted files in your editor and manually fix the conflict
$ code test/from-draft7/to-2019-09/schema.json

# Once it looks good, proceed with the rebase
$ git add .
$ git rebase --continue

# Done! Just force re-push to push your resolution
$ git push -f

@suprith-hub
Copy link
Collaborator Author

@jviotti thank you, now I am able to rebase, previously I resolve conflicts button and squash and merge buttons were disabled.
Right now its good 👍

@suprith-hub suprith-hub merged commit 46e0670 into main Aug 13, 2024
1 check passed
@suprith-hub suprith-hub deleted the draft3To4schema branch August 13, 2024 20:11
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

Successfully merging this pull request may close these issues.

2 participants