diff --git a/README.md b/README.md index fca7b186882beec58223bdc9727a924cdd2997d1..12f96fdf6c0edfd6fb4ec3a260cd0f3fd9a31422 100644 --- a/README.md +++ b/README.md @@ -43,10 +43,9 @@ 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 of this repository +## merging the new commits added to this repository 1. Normally clone the project to your local computer: - `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. @@ -57,27 +56,21 @@ You can name it how you like and you can rename your local folder to match that. 4. With terminal go to the folder with the cloned mmm-repo on your local computer. 5. Change remote origin from mmm-web-app to your new repo. - `git remote set-url origin [your new github repo here]` 6. Check that the origin changed to your new github repo. - `git remote -v` 7. Push your local clone of mmm-web-app to your new github repo. - `git push` 8. Set the original github repo of mmm-web-app as the upstream of your new project. - `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. The example fetches only master branch. - `git fetch upstream master` 10. Go to the branch of your project where you want to merge the changes in upstream. Merge, solve conflicts and enjoy. - `git merge upstream/master`