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

fatal: refusing to merge unrelated histories #326

Closed
typeofweb opened this issue Aug 1, 2022 · 2 comments
Closed

fatal: refusing to merge unrelated histories #326

typeofweb opened this issue Aug 1, 2022 · 2 comments
Labels

Comments

@typeofweb
Copy link
Contributor

typeofweb commented Aug 1, 2022

On July 29th we've merged react-storefront and saleor-checkout repositories into a single monorepo.

If you've forked this repo previosly, when merging with the main branch you might get an unexpected error message: fatal: refusing to merge unrelated histories. You can safely ignore it by using --allow-unrelated-histories switch. This will only leave you a few simple (if any!) conflicts to resolve.

If for some reason you want to keep using the old version of react-storefront (which will no longer be updated), you can pin to the newly created tag 1.0.0.

@typeofweb typeofweb pinned this issue Aug 1, 2022
@github-actions github-actions bot added the Stale label Oct 1, 2022
@github-actions github-actions bot closed this as completed Oct 9, 2022
@typeofweb typeofweb reopened this Oct 9, 2022
@github-actions github-actions bot removed the Stale label Oct 14, 2022
@github-actions
Copy link

This issue had no activity for more than 90 days. Labelling as stale.

It'll be automatically closed withing 30 days of no activity.

@github-actions github-actions bot added the Stale label Jan 13, 2023
@typeofweb typeofweb removed the Stale label Jan 16, 2023
@github-actions
Copy link

github-actions bot commented May 1, 2023

This issue had no activity for more than 90 days. Labelling as stale.

It'll be automatically closed withing 30 days of no activity.

@github-actions github-actions bot added the Stale label May 1, 2023
@saleor saleor locked as resolved and limited conversation to collaborators May 5, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

No branches or pull requests

1 participant