Home

Welcome to the Cookies-and-Code-Git wiki!

For a more comprehensive guide to git check out: http://git-scm.com/book

Merge Conflict Workflow

A merge conflict will typically occur when you attempt to push to the master branch on the origin server. Below are the basic steps to resolving merge conflicts. For full detailed information, refer to the "Basic Merge Conflicts" section in Chapter 3.2: Basic Branching and Merging of the Pro Git book.
*