Skip to content
This repository has been archived by the owner on Jul 12, 2019. It is now read-only.

Issue 28 feature #33

Merged
merged 4 commits into from
Apr 5, 2016
Merged

Issue 28 feature #33

merged 4 commits into from
Apr 5, 2016

Conversation

grosch
Copy link
Contributor

@grosch grosch commented Feb 7, 2016

Implements #28

@grosch
Copy link
Contributor Author

grosch commented Feb 10, 2016

You know you want it...

@jessesquires
Copy link
Owner

lol 😆

Thanks @grosch ! 😄

A few notes:

  • 👍 for the Cocoa* additions. For the others, I'm not sure these should be included in the library. Let's merge only the Cocoa* typealiases for now.
  • Really hate to block on this, but the commit history is particularly dirty here, looks like there are 3 unrelated commits? 😁

@grosch
Copy link
Contributor Author

grosch commented Feb 10, 2016

OK, so I hate github, and I never use it for anything but you. What I really need is for your contributing page to have explicit instructions. It needs to start with the "I had my own fork of your stuff. So first I need to update to make mine look exactly like you, then I do my code, then I do thing X to make it look the way you want, and then I submit the pull request"

@jessesquires
Copy link
Owner

OK, so I hate github

😆 I'm sorry!

img

What I really need is for your contributing page to have explicit instructions.

I'll work on this! 👍


So, the merging/rebasing on develop is technically optional. This really only needs to happen if there are conflicts. So maybe try this flow instead:

  1. Make your changes
  2. Submit a PR

If there are no conflicts, we can merge and you don't have to do anything else special. If there are conflicts, then GitHub will note this and we can handle it.

This shouldn't have any conflicts. Looks like all we need is 08083e5. If you undo the previous commits and update the branch, we should be good.

Also, sometimes it's just easier to make a new branch, copy-pasta 🍝 your changes and make a fresh commit, then submit the PR 😄

@jessesquires jessesquires added this to the 5.0.0 milestone Apr 5, 2016
@jessesquires jessesquires merged commit 12eccab into jessesquires:develop Apr 5, 2016
@jessesquires
Copy link
Owner

Thanks @grosch ! 😄

GitHub now squashes commits for PRs, so 🎉 🎉

jessesquires added a commit that referenced this pull request Apr 5, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants