Skip to content
Snippets Groups Projects
Commit 8874ecce authored by esikkala's avatar esikkala
Browse files

Update readme

parent 69ebeb38
No related branches found
No related tags found
No related merge requests found
...@@ -30,7 +30,7 @@ Run client and server concurrently: ...@@ -30,7 +30,7 @@ Run client and server concurrently:
Note: the Docker container is meant to run on a server (NODE_ENV=production). If you want Note: the Docker container is meant to run on a server (NODE_ENV=production). If you want
to run it on localhost, the API url needs to be changed in `src/client/epics/index.js`. to run it on localhost, the API url needs to be changed in `src/client/epics/index.js`.
### Build ### Build
`docker build -t mmm-web-app-c .` `docker build -t mmm-web-app-c .`
...@@ -47,32 +47,32 @@ docker run -d -p 3006:3001 --name mmm-web-app mmm-web-app-c ...@@ -47,32 +47,32 @@ docker run -d -p 3006:3001 --name mmm-web-app mmm-web-app-c
## Set up a new project using this repository as a base, with the possibility of merging the new commits added to this repository ## Set up a new project using this repository as a base, with the possibility of merging the new commits added to this repository
1. Normally clone the project to your local computer: 1. Clone this repository:
`git clone git@github.com:SemanticComputing/mmm-web-app.git` `git clone git@github.com:SemanticComputing/mmm-web-app.git`
2. Set up a new github repo. Do not initialize it with anything. It needs to be an empty repo. 2. Set up a new GitHub repository. Do not initialize it with anything. It needs to be an empty repository.
You can name it how you like and you can rename your local folder to match that. You can name it how you like and you can rename your local folder to match that.
3. Copy the url of your new repo. 3. Copy the url of your new repository.
4. With terminal go to the folder with the cloned mmm-repo on your local computer. 4. With terminal go to the folder with the clone of this repository (mmm-web-app).
5. Change remote origin from mmm-web-app to your new repo: 5. Change remote origin from mmm-web-app to your new repository:
`git remote set-url origin [your new github repo here]` `git remote set-url origin [your new github repo here]`
6. Check that the origin changed to your new github repo: 6. Check that the origin changed to your new repository:
`git remote -v` `git remote -v`
7. Push your local clone of mmm-web-app to your new github repo: 7. Push your local clone of mmm-web-app to your new repository:
`git push` `git push`
8. Set the original github repo of mmm-web-app as the upstream of your new project: 8. Set the original repository (mmm-web-app) as the upstream of your new repository:
`git remote add upstream git@github.com:SemanticComputing/mmm-web-app.git` `git remote add upstream git@github.com:SemanticComputing/mmm-web-app.git`
9. When new commits appear on the original mmm-web-app you can fetch them to your project. 9. When new commits appear on the original repository (mmm-web-app) you can fetch them to your new repository.
The example fetches only master branch: The example fetches only master branch:
`git fetch upstream master` `git fetch upstream master`
10. Go to the branch of your project where you want to merge the changes in upstream. 10. Go to the branch of your new repository where you want to merge the changes in upstream.
Merge, solve conflicts and enjoy: Merge, solve conflicts and enjoy:
`git merge upstream/master` `git merge upstream/master`
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment