webman icon indicating copy to clipboard operation
webman copied to clipboard

Alternative to create-project to allow upstream merges

Open detain opened this issue 2 years ago • 1 comments

I find it difficult to manually merge upstream webman changes in, so instead of using create-project, I first created an empty git repo https://github.com/user/myproject, then ran this to setup the repo:

git clone https://github.com/walkor/webman
cd webman
git remote remove origin
git remote add origin https://github.com/user/myproject.git
git push

then when I want to sync/merge upstream webman changes I do this:

git clone https://github.com/user/myproject
cd myproject
git remote add upstream https://github.com/walkor/webman.git
git fetch upstream
git merge --no-ff upstream/master
git commit
git push

detain avatar Sep 21 '22 12:09 detain

I don't know if there is a better way, thank you very much for sharing.

walkor avatar Sep 22 '22 02:09 walkor