search

doutriaux1 / dotfiles

My Dot Files To Sync Around All The Machines I use
7 stars 7 forks source link

dotfiles broken? #1

Open durack1 opened 8 years ago

durack1 commented 8 years ago

I just re-cloned dotfiles and got this, with alot of garbled stuff before it:

...
-bash: [: argument expected
ANACONDA:/export/durack1/anaconda2

You are logged into a Linux Machine...(Version 3.10.0-327.22.2.el7.x86_64)
 Host => grim.llnl.gov

 Hardware: x86_64....
 Using Emacs Bindings...
 11:23:12 up 23:47,  3 users,  load average: 0.08, 0.03, 0.05

(psst... may want to install "fortune")

durack1@grim:[~]:[583]>
durack1@grim:[~]:[538]> ls -al anaconda2
total 44K
drwxr-xr-x   5 durack1 climate 4.0K Jun 27 16:58 .
drwxr-xr-x  79 durack1 climate  12K Jun 30 11:24 ..
-rw-r--r--   1 durack1 climate 4.5K Feb  4 12:46 LICENSE.txt
drwxr-xr-x   2 durack1 climate 4.0K Jun 27 16:56 conda-meta
drwxr-xr-x   2 durack1 climate 4.0K Jun 27 16:58 envs
drwxr-xr-x 178 durack1 climate  12K Jun 27 16:58 pkgs
doutriaux1 commented 8 years ago

looks like you had merge conflict when bringing it in. look for <<< in your . files

durack1 commented 8 years ago

@doutriaux1 it was a fresh clone - so I think it's in the repo