From 7a89708c46b33d6d91164ff66d86d3c2471f531a Mon Sep 17 00:00:00 2001 From: xengineering Date: Wed, 23 Sep 2020 17:06:21 +0200 Subject: Change Template Update Process --- README.md | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 1022446..34376ff 100644 --- a/README.md +++ b/README.md @@ -29,25 +29,12 @@ firefox http://localhost:8080 # test with firefox git clone https://github.com/xengineering/web-template.git myproject cd myproject git remote rename origin template -git branch template # create branch for the template -git branch --set-upstream-to=template/master template -git branch --unset-upstream master -``` - -### Add a Remote for your specific Project -**This could delete data on your remote (git push -f)!** It is no problem if the remote repository is empty (e.g. if you just created it on GitHub). -``` -git remote add origin # use ssh url here -git branch -M master -git push -uf origin master ``` ### Get the latest Updates from this template Project ``` -git checkout template -git pull -git checkout master -git merge template +git fetch template +git merge template/master ``` -- cgit v1.2.3-70-g09d2