Reminder to folks about the tutorial that saper is doing for Git / Gerrit later today @ 19:00 UTC.

Below is more info, but here is a link with the highlights: https://www.mediawiki.org/wiki/Project:WikiProject_Extensions/MediaWiki_Work...

Remember to RSVP! http://doodle.com/qnrgibpqxyamqhzb

I hope to see folks there!

This is at least the third Git related training and more are coming. In other words - have no fear - help is on the way. :)

-greg aka varnent

Begin forwarded message:

From: Sumana Harihareswara sumanah@wikimedia.org Subject: [Wikitech-l] online Git/Gerrit tutorial by saper on 8 May Date: May 3, 2012 11:49:11 AM EDT To: Wikimedia developers wikitech-l@lists.wikimedia.org, D Benoit daniellebenoit@gmail.com, mediawiki-l@lists.wikimedia.org Reply-To: Wikimedia developers wikitech-l@lists.wikimedia.org

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%2Ffixedtim...

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

---

Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l