Add Animal Type and Add Pet Table #16
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added behaviour table
Install Chakra UI
Add Activities table
S24/jonathan/adding user roles
aanxniee
reviewed
Jun 28, 2024
| @@ -0,0 +1,24 @@ | |||
| import { DataType } from "sequelize-typescript"; | |||
There was a problem hiding this comment.
isn't this daniel's migration file? try rebasing, this file shouldn't be in your pr
aanxniee
reviewed
Jun 28, 2024
| import { DataType } from "sequelize-typescript"; | ||
| import { Migration } from "../umzug"; | ||
|
|
||
| export const up: Migration = async ({ context: sequelize }) => { |
There was a problem hiding this comment.
same here, this is jonathans
aanxniee
requested changes
Jun 28, 2024
There was a problem hiding this comment.
wait i'm confused, currently this pr is trying to merge main INTO your branch. i see that all the animal type and pet table changes are in the other pr. if you're trying to pull in the latest changes into your branch, what you want to do is
git checkout main
git pull
git checkout <your_branch>
git rebase main
git push --force-with-lease
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed PascalCase for linting, added animal type and pet table.