-
Notifications
You must be signed in to change notification settings - Fork 0
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
worked on landing #5
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the package.json file seems to be out of date not letting you merge it.
to fix this, you need to go to your branch on the command line. Basically, your branch is behind in some way, so if you pull the current code in main, then commit those changes, your branch will be up to date.
git checkout [your branch name]
git rebase main
then make sure everything looks good as you would normally. git add, git status, etc. Also make sure the flatpage looks good with your component added to it!! Like npm start
to launch it and you can see how your changes have now been integrated with the current version!
Now your branch will have everything currently in main and not be out of sync with main branch.
git commit -m "rebased into main"
this will merge (rebase) the main changes into your so that you are no longer behind and can complete the PR!
when you are done. you shouldn't have to make a new pull request, just refresh the page once you have pushed your commit and the check should run!
lmk if this makes sense or does not work.
Description
Please provide a summary of the changes made in this pull request:
linked image to landing page
Checklist
Screenshots
Please Include screenshots or links to visual changes for any new component (if applicable).