Project:WikiProject Extensions/MediaWiki Workshops/Git / Gerrit Tutorial
 | This page is obsolete. It is being retained for archival purposes. It may document extensions or features that are obsolete and/or no longer supported. Do not rely on the information here being up-to-date. WikiProject Extensions is not active anymore. See Manual:Extensions instead. For questions and help, see Communication. |
| Â | 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