dpsProv/Sandbox — pull request #4 by dpsProv (2012-12-13 15:29:15+00:00)
Title: Conflicts to bugfix branch

I created a branch, **bugfix-branch** and then branched that branch, **conflicts-to-bugfix-branch**.

Then I made different changes in both branches.

Next, from the **bugfix-branch**, I did a **git merge conflicts-to-bugfix-branch** to cause a conflict.

Then I did a **pull request** (this step). I selected the two branches and am about to click **Send pull request**