search

gablab / mindhive

scripts, wiki and issues related to mindhive
mindhive.mit.edu
7 stars 77 forks source link

added my cccbauer environment #61

Closed cccbauer closed 9 years ago

satra commented 9 years ago

could you please merge with current master and push again?

cccbauer commented 9 years ago

Ok, I merged and pushed again!

satra commented 9 years ago

did you fetch current master?

git fetch upstream git merge upstream/master

(at this point you will have conflicts that you would need to fix)

git add conflicted file git commit -am "fixed conflicts" git push origin

cccbauer commented 9 years ago

after putting all this in it says Everything up-to-date! is that ok