Add -s ours merge strategy to docs

mozilla-services · Jul 16, 2018 · 2335c7a · 2335c7a
1 parent 67e83c1
commit 2335c7a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/docs/server-release.md b/docs/server-release.md
@@ -9,7 +9,7 @@ To release the server:
 - [ ] Tag with `git tag VERSION`
 - [ ] Push version and tags, `git push && git push --tags`
 - [ ] Merge to `server-prod`:
-  - `git checkout server-prod && git merge master && git push`
+  - `git checkout server-prod && git merge -s ours master && git push`
   - This will trigger a deploy to stage. A deploy will take about 30 minutes.
   - View the CI build of [server-prod](https://circleci.com/gh/mozilla-services/screenshots/tree/server-prod)
   - IRC will get updates (no update until deploy happens)