lab 29 Creating a Conflict

Goals

Switch back to master and create a conflict 01

Switch back to the master branch and make this change:

Execute:

git checkout master

File: lib/hello.rb

puts "What's your name"
my_name = gets.strip

puts "Hello, #{my_name}!"

Execute:

git add lib/hello.rb
git commit -m "Made interactive"

View the Branches 02

Execute:

git hist --all

Output:

$ git hist --all
*   d1c6a6d 2013-10-06 | Merge branch 'master' into greet (greet) [Ismail Dhorat]
|\  
* | 6e84bb4 2013-10-06 | Updated Rakefile [Ismail Dhorat]
* | b90deb7 2013-10-06 | Hello uses Greeter [Ismail Dhorat]
* | 0a6c49b 2013-10-06 | Added greeter class [Ismail Dhorat]
| | * 736de04 2013-10-06 | Made interactive (HEAD, master) [Ismail Dhorat]
| |/  
| * cad8e98 2013-10-06 | Added README [Ismail Dhorat]
|/  
* 27b8b27 2013-10-06 | Added a Rakefile. [Ismail Dhorat]
* 23944f0 2013-10-06 | Moved hello.rb to lib [Ismail Dhorat]
* 273edac 2013-10-06 | Add an author/email comment [Ismail Dhorat]
* 9efd33e 2013-10-06 | Added a comment (v1) [Ismail Dhorat]
* 8b9a1c6 2013-10-06 | Added a default value (v1-beta) [Ismail Dhorat]
* f6f4d6b 2013-10-06 | Using ARGV [Ismail Dhorat]
* f98d857 2013-10-06 | First Commit [Ismail Dhorat]

Master at commit “Added README” has been merged to the greet branch, but there is now an additional commit on master that has not been merged back to greet.

Up Next 03

The latest change in master conflicts with some existing changes in greet. Next we will resolve those changes.

Table of Contents