@@ -69,33 +69,31 @@ and summarized under [Releases].
69
69
[ Releases ] : https://github.com/makenew/sass-package/releases
70
70
[ The Unlicense ] : http://unlicense.org/UNLICENSE
71
71
72
- #### Add future update support
72
+ ### Updating
73
73
74
- If you want to merge in future updates from this skeleton and have your own origin,
75
- set up a separate branch to track this.
74
+ If you want to pull in future updates from this skeleton,
75
+ you can fetch and merge in changes from this repository.
76
+
77
+ If this repository is already set as ` origin ` ,
78
+ rename it to ` upstream ` with
76
79
77
80
```
78
81
$ git remote rename origin upstream
79
- $ git branch sass-package
80
- $ git branch -u upstream/libsass sass-package
81
82
```
82
83
83
- Then add an origin and push master
84
+ and then configure your ` origin ` branch as normal.
85
+
86
+ Otherwise, add this as a new remote with
84
87
85
88
```
86
- $ git remote add origin [email protected] :your_username/your-package.git
87
- $ git push -u origin master
89
+ $ git remote add upstream https://github.com/makenew/sass-package.git
88
90
```
89
91
90
- Now, the ` sass-package ` branch will pull changes from this project,
91
- which you can then merge into your other branches.
92
-
93
- If you later clone your repo you will need to create the update branch again.
92
+ You can then fetch and merge changes with
94
93
95
94
```
96
- $ git remote add upstream https://github.com/makenew/sass-package.git
97
95
$ git fetch upstream
98
- $ git checkout -b sass-package upstream/libsass
96
+ $ git merge upstream/libsass
99
97
```
100
98
101
99
## Installation
0 commit comments