diff --git a/README.md b/README.md index 974a9dddd..c2e1e1239 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Build Status](https://travis-ci.org/openstreetmap/iD.svg?branch=master)](https://travis-ci.org/openstreetmap/iD) -:warning: _The [`master`](https://github.com/openstreetmap/iD/tree/master) branch is undergoing significant breaking changes for v3 over the next few months. [`2.x`](https://github.com/openstreetmap/iD/tree/2.x) is considerably more stable and is currently the recommended branch for downstream development._ +:warning: _We've recently changed our branch names. [`develop`](https://github.com/openstreetmap/iD/tree/develop) is now the default branch, replacing `2.x`. [`v3-prototype`](https://github.com/openstreetmap/iD/tree/v3-prototype) is now the alpha version of iD v3, replacing `master`. [`release`](https://github.com/openstreetmap/iD/tree/release) is still `release`._ [Watch the video](https://2019.stateofthemap.us/program/sat/id-v3.html) from our talk at State of the Map US 2019 to learn more about the current status of iD and our goals for v3. @@ -27,8 +27,8 @@ if you're looking for something to do. * [Translate!](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) * Test a prerelease version of iD: * Stable mirror of `release` branch: https://preview.ideditor.com/release - * Development mirror of `2.x` branch + latest translations: https://2-x--ideditor.netlify.com - * Development mirror of v3 prototype branch (`master`): https://preview.ideditor.com/master + * Development mirror of `develop` branch + latest translations: https://2-x--ideditor.netlify.com + * Development mirror of `v3-prototype` branch: https://preview.ideditor.com/master Come on in, the water's lovely. More help? Ping `bhousel` or `quincylvania` on: * [OpenStreetMap US Slack](https://slack.openstreetmap.us/) diff --git a/RELEASING.md b/RELEASING.md index 4e16e7f10..1934a5644 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -13,9 +13,9 @@ on the iD project, and then create this file with contents like
 
 ### Update `iD`
 
-#### Update `2.x` branch
+#### Update `develop` branch
 ```bash
-$  git checkout 2.x
+$  git checkout develop
 $  rm -rf node_modules/editor-layer-index/
 $  npm install
 $  npm run imagery
@@ -30,13 +30,13 @@ $  git add . && git commit -m 'npm run translations'
 
 ```bash
 $  git add . && git commit -m 'vA.B.C'
-$  git push origin 2.x
+$  git push origin develop
 ```
 
 #### Update and tag `release` branch
 ```bash
 $  git checkout release
-$  git reset --hard 2.x
+$  git reset --hard develop
 $  npm run all
 $  git add -f dist/*.css dist/*.js dist/data/* dist/img/*.svg dist/mapillary-js/ dist/pannellum-streetside/
 $  git commit -m 'Check in build'
diff --git a/scripts/txpush.sh b/scripts/txpush.sh
index dc6506a9c..e2a83de5e 100755
--- a/scripts/txpush.sh
+++ b/scripts/txpush.sh
@@ -9,7 +9,7 @@ echo "TRAVIS_NODE_VERSION=$TRAVIS_NODE_VERSION"
 
 if [[ "$TRAVIS" != "true" ]]; then exit 0; fi
 if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then exit 0; fi
-if [[ "$TRAVIS_BRANCH" != "2.x" ]]; then exit 0; fi
+if [[ "$TRAVIS_BRANCH" != "develop" ]]; then exit 0; fi
 if [[ "$TRAVIS_NODE_VERSION" != "10" ]]; then exit 0; fi
 
 echo "Pushing source strings to Transifex..."