Skip to content
This repository was archived by the owner on Feb 14, 2023. It is now read-only.

Commit 06a12c4

Browse files
committed
update readme
1 parent 3cef0d5 commit 06a12c4

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

README.md

+21
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,27 @@
22

33
[![Build Status](https://secure.travis-ci.org/openstreetmap/iD.png)](https://travis-ci.org/openstreetmap/iD)
44

5+
## Rebase and publish
6+
7+
git remote add upstream [email protected]:openstreetmap/iD.git
8+
git checkout master
9+
git fetch upstream master
10+
git rebase upstream/master
11+
git push -f
12+
make
13+
cp -r dist /tmp/
14+
git checkout gh-pages
15+
cp -r /tmp/dist/* .
16+
17+
add all files (except the dist directory to the changeset)
18+
19+
git commit -a -m "rebase off upstream master"
20+
git push
21+
22+
git checkout master
23+
24+
For every update the conflicts have been very minor.
25+
526
## Basics
627

728
* iD is a JavaScript [OpenStreetMap](http://www.openstreetmap.org/) editor.

0 commit comments

Comments
 (0)