Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
Nos Hs2023
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Språksamlingane
stadnamn
Nos Hs2023
Commits
8874ecce
Commit
8874ecce
authored
5 years ago
by
esikkala
Browse files
Options
Downloads
Patches
Plain Diff
Update readme
parent
69ebeb38
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
README.md
+11
-11
11 additions, 11 deletions
README.md
with
11 additions
and
11 deletions
README.md
+
11
−
11
View file @
8874ecce
...
@@ -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
g
it
h
ub repo. Do not initialize it with anything. It needs to be an empty repo.
2.
Set up a new
G
it
H
ub repo
sitory
. Do not initialize it with anything. It needs to be an empty repo
sitory
.
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 repo
sitory
.
4.
With terminal go to the folder with the clone
d 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 repo
sitory
:
`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`
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment