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 < amir.aharoni@mail.huji.ac.il> wrote:
2016-05-23 14:22 GMT+03:00 Andre Klapper aklapper@wikimedia.org:
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 https://www.mediawiki.org/wiki/Gerrit/Getting_started and https://www.mediawiki.org/wiki/Gerrit/Tutorial .
The original title of "Gerrit/Getting started" when I created it was "Git/TLDR". I explained the reason for this in a <!-- --> comment on top of it. It is still relevant today:
- "Gerrit/Tutorial" is 16 pages when printed.
- "Git for dummies" is 9 pages when printed.
- "Gerrit/Getting started" is 1 page when printed.
I don't know about the other pages, but the number of pages in "Gerrit/Getting started" is very much by design, and I regularly check that it still conforms to that design.
"Gerit/Tutorial" is evidently[1] more popular despite being the longest, which I find surprising, but of course I'm biased. (It may or may not have something to do with search terms.)
[1]
https://tools.wmflabs.org/pageviews/?project=mediawiki.org&platform=all-...
-- Amir Elisha Aharoni · אָמִיר אֱלִישָׁע אַהֲרוֹנִי http://aharoni.wordpress.com “We're living in pieces, I want to live in peace.” – T. Moore _______________________________________________ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l