HMS1-Harrison-Chou-Labs.md
... ...
@@ -84,7 +84,7 @@ SBGrid manages two different types of Crystal accounts. For simplicity, we use t
84 84
SBGrid supports Linux, Mac, and Windows computers in the Harrison & Chou labs.
85 85
86 86
### Linux
87
-Most Linux computers use network accounts, which means that your home directory is on a network storage server and is backed up. If you accidentally delete important files, please let us know as soon as possible and we may be able to restore the file for you. Please note that your home directory has limited disk space and should be used to store large data sets such as EM data, neither should your process data using Relion on data in your home directory.
87
+Most Linux computers use network accounts, which means that your home directory is on a network storage server and is backed up. If you accidentally delete important files, please let us know as soon as possible and we may be able to restore the file for you. Please note that your home directory has limited disk space and should not be used to store large data sets such as EM data, neither should you run Relion in your home directory.
88 88
89 89
Linux systems have network home directories and access to the SBGrid programs tree (via `/programs`). See this [link](faq-using-sbgrid-programs) for
90 90
information on how to access the software.
... ...
@@ -133,4 +133,4 @@ We have a limited number of HKL2000 Licenses. Harrison Lab members can use the f
133 133
#### EndNote
134 134
Karen can order licenses via:
135 135
136
-* <https://onthehub.com/bulk-orders>
137 136
\ No newline at end of file
137
+* <https://onthehub.com/bulk-orders>
faq-sshfs.md
... ...
@@ -69,4 +69,10 @@ An example -
69 69
`oconnor@sshfs.sbgrid.org /nfs/userdocs /Users/oconnor/userdocs`
70 70
`jo232@transfer.o2.hms.harvard.edu /home/myfolder /Users/oconnor/o2home`
71 71
72
+<<<<<<< HEAD
72 73
After it is working you can add a shortcut into your dock by navigating to your home folder on your Mac `open ~` and then dragging the sshfs_nfs.app into your dock. If you need to reconnect to the shares just press the app and it will connect or reconnect.
74
+=======
75
+For additional folders you must create the destination folder like - `mkdir ~/o2home`
76
+
77
+After it is working you can add a shortcut into your dock by navigating to /Users/Shared/ on your Mac `open /Users/Shared` and then dragging the sshfs_nfs.app into your dock. If you need to reconnect to the shares just press the app and it will connect or reconnect.
78
+>>>>>>> 8aa79253b37400a03ebc3816d37b7965d8a64915