programmers-proverbs icon indicating copy to clipboard operation
programmers-proverbs copied to clipboard

Published 20 hours ago • verified publisher icon AntJanus

add two proverbs ...

Open cdonat opened this issue 10 years ago • 5 comments

... about complexity, language and abstraction

cdonat avatar Jul 11 '14 06:07 cdonat

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.

AntJanus avatar Jul 12 '14 17:07 AntJanus

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?

cdonat avatar Jul 12 '14 20:07 cdonat

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

cdonat avatar Jul 16 '14 20:07 cdonat

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.

ricardo-valerio avatar Feb 14 '18 03:02 ricardo-valerio

@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!

AntJanus avatar Feb 14 '18 16:02 AntJanus