Skip to content

howto rebase/merge with different origin iteration #17

Answered by greph
magana1 asked this question in Help
Discussion options

You must be logged in to vote

Hey @magana1 , are you looking to make a contribution to the Swell template or simply push up your changes back to your Swell-hosted storefront? If the latter, you can simply make a local commit and push your changes back up to remote.

If you'd like to also pull in the latest changes from the Origin template, you can add a second remote repo linking to the public Origin repo and then merge in those newer changes. Finally, I'd recommend adding the --force flag when pushing changes back to your Swell-hosted remote repo.

I hope this helps - let me know if you have any questions!

Replies: 1 comment

Comment options

You must be logged in to vote
0 replies
Answer selected by logeshswell
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Category
Help
2 participants