Open main menu

CDOT Wiki β

Changes

DPS909 & OSD600 Winter 2017 - Lab 4

721 bytes added, 11:56, 2 February 2017
no edit summary
# Create a fourth branch that points to the same commit as <code>name</code>: <code>git checkout -b name-and-food name</code>
# Merge the <code>fav-food</code> branch into <code>name-and-food</code>. When you merge, you always switch to (i.e., <code>checkout</code>) the branch into which you want to merge first, then <code>merge</code> the other branch in: <code>git merge fav-food</code>. Because we are merging two branches that have different commit histories, git will use a '''recursive''' merge strategy, and create a new commit '''merge commit''' that connects these two branches.# Confirm that you now have a new '''merge commit''' on the <code>name-and-food</code> branch (i.e., use <code>git log</code>).# Confirm that the <code>name-and-food</code> branch contains both the <code>name.txt</code> and <code>food.txt</code> files, created on the earlier branches.# Try switching back to your <code>name</code> branch, confirm that you don't have a <code>food.txt</code> file.# Try switching back to your <code>fav-food</code> branch, confirm that you don't have a <code>name.txt</code> file.