Skip to content

Commit 26283e7

Browse files
Made easier to read.
1 parent 9290c15 commit 26283e7

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

docs/update-levelbuilder.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@ This .md file should only contain information which is specific to Code.org engi
99
1. Or in your local repository:
1010
- `git checkout levelbuilder`
1111
- `git pull origin levelbuilder` To make sure you're up-to-date.
12-
- `git pull origin staging` To fetch and merge `staging` directly into `levelbuilder`. You'll likely get "both modified" merge conflicts in `dashboard/public/blockly-package/*` and for `blockly-core/blockly_compressed.js` and `blockly-core/blockly_uncompressed.js`. We don't want to merge in `staging`'s copies of the `blockly-core` and `blockly` build products because they're out of date and need to be rebuilt immediately anyway. Do this:
13-
1. `git checkout --ours dashboard/public/blockly-package blockly-core/blockly_compressed.js blockly-core/blockly_uncompressed.js`
14-
1. `git add dashboard/public/blockly-package blockly-core/blockly_compressed.js blockly-core/blockly_uncompressed.js`
15-
1. Fix any remaining merge conficts, if any.
12+
- `git pull origin staging` To fetch and merge `staging` directly into `levelbuilder`.
13+
- You'll likely get "both modified" merge conflicts in `dashboard/public/blockly-package/*`, `blockly-core/blockly_compressed.js` and `blockly-core/blockly_uncompressed.js`. We don't need staging's copies of these build products - they're out of date and about to be rebuilt anyway, so do:
14+
1. `git checkout --ours blockly-core/blockly_compressed.js blockly-core/blockly_uncompressed.js`
15+
1. `git add blockly-core/blockly_compressed.js blockly-core/blockly_uncompressed.js`
16+
1. `git checkout --ours dashboard/public/blockly-package`
17+
1. `git add dashboard/public/blockly-package`
18+
1. Fix remaining merge conficts, if any.
1619
1. `git commit`
1720
- `git push`
1821
1. Wait for levelbuilder to deploy.

0 commit comments

Comments
 (0)