Arc Forumnew | comments | leaders | submitlogin
1 point by akkartik 1256 days ago | link | parent

arc-openshift installs anarki:

Just cd into the arc directory ($OPENSHIFT_DATA_DIR/arc, but I'm not sure how to deduce OPENSHIFT_DATA_DIR) and run:

  $ git pull

1 point by tvvocold 1255 days ago | link

when i git pull i got

  error: Your local changes to the following files would be overwritten by merge:
  Please, commit your changes or stash them before you can merge.


1 point by akkartik 1255 days ago | link

Have you made any changes to news.arc? Mail me the output of this command, and I'll help you with the merge.

  $ git diff lib/news.arc