search

okfn / handbook

Guides and introductions for participating in Labs and some of its projects.
http://okfnlabs.org/handbook/
170 stars 51 forks source link

[misc] preparing to continue working on issue #90 #113

Closed gsilvapt closed 8 years ago

gsilvapt commented 8 years ago

Directories have been tidied up and now we can work on issue #90.

@rgrp Do you think I should remove all these unnecessary commits like "Merge remote..." and "Merge branch"? I think I messed up with the git pull and push commands. Not necessarily important, IMO, but just to keep things clean.

Thanks.

rufuspollock commented 8 years ago

@gsilvapt this still includes the original commit with the wrong files. I don't think the rebase has worked here.

Right now i'm just going to merge ;-)

Let's move it forward :-)

gsilvapt commented 8 years ago

I don't understand. I manually deleted these files and I don't have these in my local directory.

Soon I will work on a "patch" fix to rebase all these commits and reset to the proper structure. I will then pull those and proceed with #90.

rufuspollock commented 8 years ago

@gsilvapt please do not do anything more here! I've merged as it was :-) Move on to the next things we want to do ...