Re: [Wikitech-l] Wikimedia Git/Gerrit/Code Review technical documentation updates

2016-05-26 Thread Andre Klapper
On Mon, 2016-05-23 at 17:32 +, Chad wrote: > On Mon, May 23, 2016 at 9:42 AM Bernd Sitzmann wrote: > > > > I think it would be great to favor git fetch and git rebase over git pull > > and merge[1] in the beginners documentation so people don't start out with > > bad habits. > > > > [1]

Re: [Wikitech-l] Wikimedia Git/Gerrit/Code Review technical documentation updates

2016-05-24 Thread Mukunda Modell
In case it wasn't obvious: That was mostly intended as humor, though I do find the Help:Git_rebase article to be very one sided. On Tue, May 24, 2016 at 10:00 PM, Mukunda Modell wrote: > I should stop myself here and just echo what Chad said but I feel > compelled to say

Re: [Wikitech-l] Wikimedia Git/Gerrit/Code Review technical documentation updates

2016-05-24 Thread Mukunda Modell
I should stop myself here and just echo what Chad said but I feel compelled to say more. Skip past the quoted text for the tl;dr version. That article[1] comes across as incredibly condescending. Is the purpose to keep people ignorant and oppressed? Prevent them from understanding nuance by

Re: [Wikitech-l] Wikimedia Git/Gerrit/Code Review technical documentation updates

2016-05-23 Thread Chad
On Mon, May 23, 2016 at 9:42 AM Bernd Sitzmann wrote: > I think it would be great to favor git fetch and git rebase over git pull > and merge[1] in the beginners documentation so people don't start out with > bad habits. > > [1]

Re: [Wikitech-l] Wikimedia Git/Gerrit/Code Review technical documentation updates

2016-05-23 Thread Bernd Sitzmann
I think it would be great to favor git fetch and git rebase over git pull and merge[1] in the beginners documentation so people don't start out with bad habits. [1] https://wikitech.wikimedia.org/wiki/Help:Git_rebase Bernd On Mon, May 23, 2016 at 5:37 AM, Amir E. Aharoni <

Re: [Wikitech-l] Wikimedia Git/Gerrit/Code Review technical documentation updates

2016-05-23 Thread Amir E. Aharoni
2016-05-23 14:22 GMT+03:00 Andre Klapper : > Some stuff I did not touch (as perfect is the enemy of good). > For example, I'm still wondering about the role of > https://www.mediawiki.org/wiki/Git_for_dummies compared to >

[Wikitech-l] Wikimedia Git/Gerrit/Code Review technical documentation updates

2016-05-23 Thread Andre Klapper
[For your info] I've spend some time in the last weeks rewriting and cleaning up our technical Git / Gerrit / Code Review documentation on mediawiki.org. 135 edits later, things feel a bit cleaner. :) === Changes === There is a central Git/Gerrit "Troubleshooting" page linked from the most