Skip to content

woodar.dj

Jonathan Woodard inflicts things upon the internet

Main Navigation

  • Home
  • About
  • Valour

git pull

Jonathan Woodard 31 Dec 2013 25 Jun 2012
Share

git-animals:

git pull

error: Your local changes to the following files would be overwritten by merge:

config/actions.yml config/deploy.rb views/dispatch.erb 

Please, commit your changes or stash them before you can merge.

Related

Categories Uncategorized

Post navigation

Previous Previous post: Brewery Map
Next Next post: D & D & B

Primary Sidebar

Valour

A strategy board game about the Gallic War, as told by the Gauls.

Only the tribes which put up the fiercest resistance in the face of inevitable conquest will be remembered by history!

Coming soon. Read more →

Categories

Archives

Posts via email

Recent Posts

  • Eulogy for my Mom
  • Took/taking a little break?
  • Big News 2019!
  • Game Design by “Particles”
  • Designing from the Road: The Box of Bits

Recent Comments

  • MiguelHP on Asana Instagantt Chrome Plugin
  • woodardj on “Award Winning” Game Designer
  • Patrick Tumpane on “Award Winning” Game Designer
  • Conor McGoey on Origins 2017 Roundup
  • woodardj on “COVER ME!”: Convenient covers for things you don’t know how to do

woodar.dj © 2021 . All Rights Reserved