Arc Forumnew | comments | leaders | submitlogin
1 point by tvvocold 1254 days ago | link | parent

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 1254 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