GitHub: Using GitHub for Enterprise Drupal

This Self-Help Guide is intended to assist developers that are going to develop within the University of Minnesota Drupal environment. There are three primary tools that are needed: Git, GitHub, and UMN Drupal (which consists of: Acquia Dev Desktop to be able to run Drupal locally; a copy of the UMN Drupal codebase; a copy of your site's database and files).

View PDF

Set Up Git and GitHub

Overview of Github.umn.edu and Git

Overview of github.umn.edu
Getting Started with Git
Pro Git book
No-cost, beginner-level course
Git Basic Concept Course
Paid, beginner-level course with free trial option

Set Up Git and GitHub

Getting Started - Installing Git
Git Cheat Sheet
Get Account from UMN Github
Errors Accessing UMN Github
How to Create an Organization in Github
How to Create an Organization in Github from Scratch
Adding Other Users to Your Organization
Generating SSH Keys to Simplify Logging In to Github
What is Secure Shell (SSH)?

Acquia Dev Desktop & UMN Drupal

Configure a Drupal Enterprise 7 Local Environment

Download Acquia Dev desktop
Configure Acquia Dev Desktop
Install Drupal Locally
Log in to Your Local Drupal Site
Get a Copy of Your Site's Database and Files

Configure a Drupal Enterprise 9 Local Environment

Set up a Drupal 9 Local Environment

Set Up UMN Drupal to Run Locally

Install UMN Drupal Locally to Work with UMN GIT Repository
Code Workflow in UMN Drupal
Push Changes to Your Repository Using Git Shell

Manage Your Drupal Site's Code

Working with Git

Create and Manage GitHub Branches in github.umn.edu
Push your code to GitHub
Pull code from GitHub
Create and Manage GitHub Branches in github.umn.edu
Create a Branch
Move Between Branches
Merge Code Across Branches
Resolving Merge Conflicts from the command line
Git Branches in a Nutshell
Git Essentials Merging Branches
Handling and Avoiding Conflicts in Git
Resolving Merge Conflicts from the command line
Git Status Command
Git Log Command
Git Diff Command
5 Useful Tips For A Better Commit Message
Writing good commit messages
Windows Command Prompt in 15 Minutes
Introduction to the Mac OS X Command Line
Gitignore Documentation
Using GitIgnore

Get Your Code to Your Online Drupal Site (aka Build Plans)

Code Workflow in UMN Drupal
Pushing Changes to Your Repository