Wings 3d Handbook - see instructions on rendering.

1. Pull the update from master, or whereever – git pull
2. See the dreaded merge failed message
3. Edit the files which failed to merge correctly cleaning up the code
4. Run your tests / specs just to make sure you caught everything
5. Add and commit the manually merged file. git add path/to/file.rb; git commit -m “work damnit”
6. Go back to pushing and pulling in peace