From 6edb4ffd490cbc5b8c1167fb0a4824c27bad2df8 Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 25 Jun 2018 16:25:50 -0700 Subject: [PATCH] Resolve merge conflict --- packages/react-scripts/template/README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md index c773d2435..d5b4fc98a 100644 --- a/packages/react-scripts/template/README.md +++ b/packages/react-scripts/template/README.md @@ -2217,9 +2217,6 @@ GitHub Pages doesn’t support routers that use the HTML5 `pushState` history AP * You could switch from using HTML5 history API to routing with hashes. If you use React Router, you can switch to `hashHistory` for this effect, but the URL will be longer and more verbose (for example, `http://user.github.io/todomvc/#/todos/42?_k=yknaj`). [Read more](https://reacttraining.com/react-router/web/api/Router) about different history implementations in React Router. * Alternatively, you can use a trick to teach GitHub Pages to handle 404 by redirecting to your `index.html` page with a special redirect parameter. You would need to add a `404.html` file with the redirection code to the `build` folder before deploying your project, and you’ll need to add code handling the redirect parameter to `index.html`. You can find a detailed explanation of this technique [in this guide](https://github.com/rafrex/spa-github-pages). -<<<<<<< HEAD -### Heroku -======= #### Troubleshooting ##### "/dev/tty: No such a device or address" @@ -2231,7 +2228,6 @@ If, when deploying, you get `/dev/tty: No such a device or address` or a similar 3. Try `npm run deploy again` ### [Heroku](https://www.heroku.com/) ->>>>>>> dfbc71ce2ae07547a8544cce14a1a23fac99e071 Use the [Heroku Buildpack for Create React App](https://github.com/mars/create-react-app-buildpack).
You can find instructions in [Deploying React with Zero Configuration](https://blog.heroku.com/deploying-react-with-zero-configuration).