[Mediawiki-l] online Git/Gerrit tutorial by saper on 8 May

Sumana Harihareswara sumanah at wikimedia.org
Thu May 3 15:49:11 UTC 2012


Volunteer Marcin Cieslak (saper) is doing the great service of leading a
Git and Gerrit tutorial on May 8th 19:00 UTC. It will be 1-1.5 hours.

If you intend to come, please fill out this poll so saper knows how many
people are coming and what they already know.

http://doodle.com/qnrgibpqxyamqhzb

Time conversion:
http://doodle.com/r?url=http%3A%2F%2Ftimeanddate.com%2Fworldclock%2Ffixedtime.html%3Fmsg%3DHardcode%2BGit%252BGerrit%2BWorkshop%26iso%3D20120508T19%26ah%3D1%26am%3D30

To participate, you'll need to:

* get developer access for Git/Gerrit/Wikimedia Labs
https://www.mediawiki.org/wiki/Developer_access
* install a SIP client ("Blink and CSipSimple for Android are
recommended and tested (with HD audio); I'll provide SIP dial-in")
* install vncviewer
* ensure you can ssh from a terminal

Marcin will cover:

Basics:

    setting up Git
    submitting a patch
    commenting on a patch in Gerrit
    merging a patch in Gerrit
    enough Git internals not to get lost

Branching:

    local branch, making, working & pushing
    remote branch & git-review to that remote branch

Troubleshooting:

    cherrypick changes between branches
    amending (rebase vs multiple commit)
    squashing work from a branch into a commit and pushing it
    resolve merge conflicts

Thanks, Marcin!

-- 
Sumana Harihareswara
Engineering Community Manager
Wikimedia Foundation



More information about the MediaWiki-l mailing list