swyxio / swyxkit

An opinionated blog starter for SvelteKit + Tailwind + Netlify. Refreshed for SvelteKit 1.0!
https://swyxkit.netlify.app/
MIT License
681 stars 89 forks source link

Maintaining fork while keeping up to date with downstream repo #194

Open georgeoffley opened 1 year ago

georgeoffley commented 1 year ago

What workflow do people using swyxkit use for maintaining all your changes while keeping up to date with the original repo changes?

I've gotten away with creating a new branch -> syncing the repos with the new branch -> merging into main, and correcting all the merge conflicts.

It works, but I'm curious about what others do.

swyxio commented 1 year ago

i dont know either! haha

the "correct" way to do this is bundle all this stuff into an npm package that people can install and upgrade nicely. but i havent spent the time to figure out how to do it tbh