Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add two proverbs ... #33

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add two proverbs ... #33

wants to merge 3 commits into from

Conversation

cdonat
Copy link

@cdonat cdonat commented Jul 11, 2014

... about complexity, language and abstraction

@AntJanus
Copy link
Owner

these two last ones aren't really proverbs. I like your take on the first one, please refactor so this can merge the first one in.

@cdonat
Copy link
Author

cdonat commented Jul 12, 2014

Maybe you can help me with that. How do I split a single, existing commit in two, so that I can extract the one, you like to have?

remote the two proverbs, that will not be merged.
@cdonat
Copy link
Author

cdonat commented Jul 16, 2014

Now I simply removed the two proverbs that you did not want to merge and made a new commit.

@ricardo-valerio
Copy link

I think Git[hub] just gave us 2 more proverbs:

  1. Some branches have conflicts that must be resolved.
  2. Only those with write access can merge pull requests.

@AntJanus
Copy link
Owner

@rvzzz can you add those as a separate PR? 😆

And @cdonat if you resolve the conflicts, I'll merge it right away. Sorry for the 4 years of delay!

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.

3 participants