cloudnull

#!/usr/bin/env bash
# Copyright 2015, Rackspace US, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#     http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software

hughsaunders

Simple example of a merge conflict

####Overview

• add a file
• create new branch
• modify same section of file in both branches in a conflicting way
• attempt to merge one branch into the other

####Process

1. add file