Skip to content

Conversation

@ghost
Copy link

@ghost ghost commented Feb 8, 2016

So, this sorts the file formats by their MIME-Type and adds a table to the README.md. (and moves the template for file formats into the file formats folder and calls it TEMPLATE.md) (And it Renames the Folder 'File Formats' in 'File-Formats' because on the GitHub Website you aren't able to create or move to a Folder which contains a space in its name)

  • Move and rename File Formats
  • Move and rename the Template
  • Move the Recommendations into the File Formats README.md
  • Reciveve General Approvement

This Pull Request is releated to #46 .

@ghost ghost mentioned this pull request Feb 8, 2016
@oeed oeed added the meta label Feb 8, 2016
@oeed
Copy link
Owner

oeed commented Feb 8, 2016

Yeah I quite like this structuring, nice job 👍

@ghost
Copy link
Author

ghost commented Feb 8, 2016

@oeed , do you have ideas for the descriptions?

@viluon
Copy link
Collaborator

viluon commented Feb 9, 2016

Hold on @oeed, we need to merge #13 first or we'll get collisions on the tutorial branch!

EDIT: Also, I think that you should change "Recommendations" to "Use Cases" (or something similar) @justsomeoneelseagain, sounds more descriptive imo.

@viluon viluon changed the title MIME-Type based file structure Switch to MIME Type-based Repository Structure Feb 9, 2016
@Luca0208
Copy link
Contributor

Luca0208 commented Feb 9, 2016

I really like this too 👍

@ghost
Copy link
Author

ghost commented Feb 9, 2016

This is no longer WIP, if there aren´t any suggestions.

here you are @viluon and i fixed a formatting issue too
@viluon
Copy link
Collaborator

viluon commented Feb 9, 2016

This is no longer WIP, if there aren´t any suggestions.

Please leave that on the mods, they know how to handle labels 😉

@lyqyd
Copy link
Collaborator

lyqyd commented Feb 9, 2016

Are we back to text/lua now, or are the lua/table, etc. set yet to be merged?

@oeed
Copy link
Owner

oeed commented Feb 10, 2016

@lyqyd, yes, mainly due the objections with #39. @viluon we need to make a decision on that.

@oeed
Copy link
Owner

oeed commented Feb 11, 2016

@demhydraz or @viluon I'm not expert with conflict resolution at all, how do we fix this?

@lyqyd
Copy link
Collaborator

lyqyd commented Apr 19, 2016

If we're ready to merge this but simply need to resolve the merge conflicts, I can take care of that tonight or tomorrow. @oeed, @viluon, anything else we need to do other than simply fix the merge? This appears to have general approval.

@viluon
Copy link
Collaborator

viluon commented Apr 20, 2016

Whoa, thanks for the bump @lyqyd, totally forgot about this 😕 I don't think anyone is against this, if you could fix the conflicts, that would be great! Then we'd be good to go. I'd help you out but am busy this week.

@oeed
Copy link
Owner

oeed commented Apr 20, 2016

Agreed @viluon

@lyqyd lyqyd self-assigned this Apr 20, 2016
@lyqyd lyqyd merged commit 107fae9 into oeed:master Apr 23, 2016
@lyqyd
Copy link
Collaborator

lyqyd commented Apr 23, 2016

Okay, I've manually merged this, so we should be good go to.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants