Skip to content

Commit eb4df06

Browse files
authored
Merge pull request #147 from DDMAL/kyrieb-ekat-patch-1
Updated README.md
2 parents 3cff63b + df26f95 commit eb4df06

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,16 @@ Assuming you have [Git](https://www.atlassian.com/git/tutorials/install-git) ins
2222
git clone https://github.com/DDMAL/ddmal.github.io.git
2323
```
2424

25-
Enter the directory with `cd ddmal.github.io`, and pull from the repository to your local folder. Specifically, pull from the 'deforested' branch, the branch used by GitHub Pages to host the site.
25+
Enter the directory with `cd ddmal.github.io`, and pull from the repository to your local folder. Specifically, pull from 'master' (NOTE: this was once 'deforested'), the branch used by GitHub Pages to host the site.
2626

2727
```
28-
git pull origin deforested
28+
git pull origin master
2929
```
3030

31-
At this point, the site is able to be edited and run locally. Use the VSCode "Live Server" extension to view the static website in your browser and track changes automatically.
31+
At this point, the site is able to be edited and run locally. Use the VSCode "Live Server" extension to view the static website in your browser and track changes automatically. Make sure you make your own branch to be merged later.
32+
33+
> [!CAUTION]
34+
> As of [7 July 2023]([url](https://github.com/DDMAL/ddmal.github.io/pull/120)), deforested was merged with master; at this stage make sure you are pulling from master **not deforested** or you will get an error (probably "fatal:..." etc.). See https://github.com/DDMAL/ddmal.github.io/pull/120 .
3235
3336
## Creating your lab member page
3437

0 commit comments

Comments
 (0)