Project:WikiProject Extensions/MediaWiki Workshops/Git / Gerrit Tutorial

From MediaWiki.org
Jump to navigation Jump to search
 Home Discussion Participants Projects Ideas & Requests Workshops Barnstars Templates 


Git / Gerrit Tutorial

This tutorial covers:

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

Trainer[edit]

Resources[edit]