summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxengineering <mail2xengineering@protonmail.com>2020-09-23 17:06:21 +0200
committerxengineering <mail2xengineering@protonmail.com>2020-09-23 17:06:21 +0200
commit7a89708c46b33d6d91164ff66d86d3c2471f531a (patch)
tree26844db5ca9fd908b9ffa6fa88a77a302eb95fcf
parentea8b9ae337b50f0195592f80a9992d5ff88ec8ff (diff)
downloadweb-template-7a89708c46b33d6d91164ff66d86d3c2471f531a.tar
web-template-7a89708c46b33d6d91164ff66d86d3c2471f531a.tar.zst
web-template-7a89708c46b33d6d91164ff66d86d3c2471f531a.zip
Change Template Update Process
-rw-r--r--README.md17
1 files 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 <myproject-upstream-url> # 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
```