CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-23 08:39:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update various files for removal of master branch

Browse Source
This commit is contained in:
Quincy Morgan
2020-03-23 10:43:52 -07:00
parent a7cba6a694
commit d669bbef2a
50 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RELEASING.md
+5 -5
View File
@@ -54,13 +54,13 @@ $ git remote add osmlab git@github.com:osmlab/openstreetmap-website.git
$ git remote add upstream git@github.com:openstreetmap/openstreetmap-website.git
```
#### Sync master branches
#### Sync develop branches
```bash
$ git fetch --all
$ git checkout master
$ git reset --hard upstream/master
$ git push osmlab master
$ git checkout develop
$ git reset --hard upstream/develop
$ git push osmlab develop
```
#### Create and push branch with the new iD version
@@ -72,4 +72,4 @@ $ rm -rf vendor/assets/iD/* && vendorer
$ git add . && git commit -m 'Update to iD vA.B.C'
$ git push osmlab
```
- [Open a pull request](https://github.com/openstreetmap/openstreetmap-website/compare/master...osmlab:master) using the [markdown text from the changelog](https://raw.githubusercontent.com/openstreetmap/iD/master/CHANGELOG.md) as the description
- [Open a pull request](https://github.com/openstreetmap/openstreetmap-website/compare/develop...osmlab:develop) using the [markdown text from the changelog](https://raw.githubusercontent.com/openstreetmap/iD/develop/CHANGELOG.md) as the description