Skip to content

Commit 6a3fd71

Browse files
authored
Merge branch 'ControlCore-Project:main' into main
2 parents 4d4801f + cd49d63 commit 6a3fd71

1 file changed

Lines changed: 20 additions & 0 deletions

File tree

README.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,25 @@ This branch will be synced with the changes from the main periodically. Easy to
3333
2. `npm i`
3434
3. `npm start`
3535

36+
If this throws a long error in the browser and console about line endings (LF/CRLF), please follow the below steps.
37+
38+
In ~/.gitconfig, set autocrlf to false as below.
39+
````
40+
[core]
41+
autocrlf = false
42+
````
43+
44+
Then run the below from the concore editor source code in terminal.
45+
46+
````
47+
git rm --cached -r .
48+
git reset --hard
49+
git pull --rebase
50+
````
51+
52+
Now re-run with npm as above.
53+
54+
3655
This branch may contain `src/graph-builder/tailored-graph-builder.js`. It can be safely removed.
3756

3857
### 2. Make changes to the master branch
@@ -67,4 +86,5 @@ We have two workflows.
6786

6887

6988
Please go to the url https://github.com/ControlCore-Project/concore-editor/actions/workflows/buildAndDeploy.yml and trigger this particular workflow. This will in turn automatically trigger the Pages Build and Deploy action. Once that action also completes successfully, the new page will be alive. Depending on the nature of the changes, you may need to clear the cache/cookies to make the changes visible to your browser. You can choose to delete just the cookies and data of controlcore-project.github.io as stored in your browser. Please check the browser documentation for more information on deleting the cookies.
89+
7090

0 commit comments

Comments
 (0)